Fix generation of workflow_sources/deps.yml on darwin [ci skip]

Also drop the suite timing information we no longer use, and sort
alphabetically to minimize future diffs

2 files changed, 105 insertions, 155 deletions

diff --git a/mk/github-actions.mk b/mk/github-actions.mk
index 6a9989808b..ca229e8505 100644
--- a/mk/github-actions.mk
+++ b/mk/github-actions.mk
@@ -51,11 +51,11 @@ DEPS_YAML_FILE = workflow_sources/deps.yml
 
 define dep_yaml_chunk
 $(eval SUITES := $(sort $(subst _SUITE.erl,,$(notdir $(wildcard deps/$(1)/test/*_SUITE.erl)))))
-echo -n "\n- name: $(1)\n  suites:$(if $(SUITES),$(foreach suite,$(SUITES),\n  - name: $(suite)\n    time: 0), [])" >> $(DEPS_YAML_FILE);
+echo "\n- name: $(1)\n  suites:$(if $(SUITES),$(foreach suite,$(SUITES),\n  - name: $(suite)), [])" >> $(DEPS_YAML_FILE);
 endef
 
 $(DEPS_YAML_FILE):
-	@echo -n "#@data/values\n---\n#@overlay/match missing_ok=True\ndeps:" > $@
+	@echo "#@data/values\n---\n#@overlay/match missing_ok=True\ndeps:" > $@
 	@$(foreach dep,$(VENDORED_COMPONENTS),$(call dep_yaml_chunk,$(dep)))
 	@cat $@ | git stripspace > $@.fixed && mv $@.fixed $@
 
diff --git a/workflow_sources/deps.yml b/workflow_sources/deps.yml
index b049c8ba91..815383ceed 100644
--- a/workflow_sources/deps.yml
+++ b/workflow_sources/deps.yml
@@ -2,435 +2,385 @@
 ---
 #@overlay/match missing_ok=True
 deps:
+
 - name: rabbit_common
   suites:
-  - name: unit_priority_queue
+  - name: rabbit_env
+  - name: supervisor2
   - name: unit
+  - name: unit_priority_queue
   - name: worker_pool
-  - name: rabbit_env
+
 - name: rabbit
   test_suites_in_parallel: true
   suites:
   - name: amqqueue_backward_compatibility
-    time: 63
   - name: backing_queue
-    time: 320
   - name: channel_interceptor
-    time: 103
   - name: channel_operation_timeout
-    time: 104
   - name: cluster
-    time: 85
   - name: cluster_rename
-    time: 284
   - name: clustering_management
-    time: 708
   - name: config_schema
-    time: 81
   - name: confirms_rejects
-    time: 138
   - name: consumer_timeout
-    time: 123
   - name: crashing_queues
-    time: 124
   - name: dead_lettering
-    time: 173
   - name: definition_import
-    time: 84
   - name: disconnect_detected_during_alarm
-    time: 88
   - name: dynamic_ha
-    time: 900
   - name: dynamic_qq
-    time: 238
   - name: eager_sync
-    time: 452
   - name: feature_flags
-    time: 102
   - name: lazy_queue
-    time: 125
   - name: list_consumers_sanity_check
-    time: 86
   - name: list_queues_online_and_offline
-    time: 85
   - name: maintenance_mode
-    time: 185
   - name: many_node_ha
-    time: 112
   - name: message_size_limit
-    time: 78
   - name: metrics
-    time: 160
   - name: mirrored_supervisor
-    time: 82
   - name: msg_store
-    time: 65
   - name: peer_discovery_classic_config
-    time: 136
   - name: peer_discovery_dns
-    time: 76
   - name: per_user_connection_channel_limit
-    time: 69
   - name: per_user_connection_channel_limit_partitions
-    time: 56
   - name: per_user_connection_channel_tracking
-    time: 89
   - name: per_user_connection_tracking
-    time: 132
   - name: per_vhost_connection_limit
-    time: 252
   - name: per_vhost_connection_limit_partitions
-    time: 123
   - name: per_vhost_msg_store
-    time: 66
   - name: per_vhost_queue_limit
-    time: 137
   - name: policy
-    time: 86
   - name: priority_queue
-    time: 243
   - name: priority_queue_recovery
-    time: 90
   - name: product_info
-    time: 93
   - name: proxy_protocol
-    time: 78
   - name: publisher_confirms_parallel
-    time: 126
   - name: queue_length_limits
-    time: 84
   - name: queue_master_location
-    time: 401
   - name: queue_parallel
-    time: 260
   - name: queue_type
-    time: 56
   - name: quorum_queue
-    time: 687
   - name: rabbit_confirms
-    time: 4
   - name: rabbit_core_metrics_gc
-    time: 221
   - name: rabbit_fifo
-    time: 79
   - name: rabbit_fifo_int
-    time: 86
   - name: rabbit_fifo_prop
-    time: 169
   - name: rabbit_fifo_v0
-    time: 6
   - name: rabbit_msg_record
-    time: 4
   - name: rabbit_stream_queue
-    time: 592
   - name: rabbitmq_queues_cli_integration
-    time: 85
   - name: rabbitmqctl_integration
-    time: 100
   - name: rabbitmqctl_shutdown
-    time: 67
   - name: signal_handling
-    time: 164
   - name: simple_ha
-    time: 426
   - name: single_active_consumer
-    time: 78
   - name: sync_detection
-    time: 125
   - name: term_to_binary_compat_prop
-    time: 66
   - name: topic_permission
-    time: 77
   - name: unit_access_control
-    time: 90
   - name: unit_access_control_authn_authz_context_propagation
-    time: 87
   - name: unit_access_control_credential_validation
-    time: 74
   - name: unit_amqp091_content_framing
-    time: 67
   - name: unit_amqp091_server_properties
-    time: 95
   - name: unit_app_management
-    time: 79
   - name: unit_cluster_formation_locking_mocks
-    time: 56
   - name: unit_collections
-    time: 61
   - name: unit_config_value_encryption
-    time: 99
   - name: unit_connection_tracking
-    time: 16
   - name: unit_credit_flow
-    time: 81
   - name: unit_disk_monitor
-    time: 80
   - name: unit_disk_monitor_mocks
-    time: 76
   - name: unit_file_handle_cache
-    time: 93
   - name: unit_gen_server2
-    time: 80
   - name: unit_gm
-    time: 65
   - name: unit_log_config
-    time: 75
   - name: unit_log_management
-    time: 104
   - name: unit_operator_policy
-    time: 66
   - name: unit_pg_local
-    time: 68
   - name: unit_plugin_directories
-    time: 52
   - name: unit_plugin_versioning
-    time: 69
   - name: unit_policy_validators
-    time: 68
   - name: unit_priority_queue
-    time: 70
   - name: unit_queue_consumers
-    time: 73
   - name: unit_stats_and_metrics
-    time: 88
   - name: unit_supervisor2
-    time: 71
   - name: unit_vm_memory_monitor
-    time: 81
   - name: upgrade_preparation
-    time: 117
   - name: vhost
-    time: 211
+
 - name: amqp_client
   skip_dialyzer: true
   suites:
-  - name: unit
   - name: system
+  - name: unit
+
 - name: amqp10_client
   skip_tests: true
   suites:
-  - name: system
   - name: msg
+  - name: system
+
 - name: amqp10_common
   suites:
   - name: binary_generator
+
 - name: rabbitmq_amqp1_0
   skip_dialyzer: true
   skip_tests: true
   suites:
   - name: amqp10_client
-  - name: proxy_protocol
   - name: command
-  - name: unit
+  - name: proxy_protocol
   - name: system
+  - name: unit
+
 - name: rabbitmq_auth_backend_cache
   skip_dialyzer: true
   suites:
+  - name: config_schema
   - name: rabbit_auth_backend_cache
   - name: rabbit_auth_cache
-  - name: config_schema
+
 - name: rabbitmq_auth_backend_http
   skip_dialyzer: true
   suites:
-  - name: unit
   - name: auth
   - name: config_schema
+  - name: unit
+
 - name: rabbitmq_auth_backend_ldap
   skip_dialyzer: true
   skip_tests: true
   suites:
-  - name: unit
-  - name: system
   - name: config_schema
+  - name: system
+  - name: unit
+
 - name: rabbitmq_auth_backend_oauth2
   skip_dialyzer: true
   suites:
-  - name: wildcard_match
-  - name: unit
+  - name: add_uaa_key_command
   - name: scope
   - name: system
-  - name: add_uaa_key_command
+  - name: unit
+  - name: wildcard_match
+
 - name: rabbitmq_auth_mechanism_ssl
   suites: []
+
 - name: rabbitmq_aws
   skip_dialyzer: true
   suites: []
+
 - name: rabbitmq_cli
   skip_dialyzer: true
   suites: []
+
 - name: rabbitmq_codegen
   skip_xref: true
   skip_dialyzer: true
   skip_tests: true
   suites: []
+
 - name: rabbitmq_consistent_hash_exchange
   skip_dialyzer: true
   suites:
   - name: rabbit_exchange_type_consistent_hash
+
 - name: rabbitmq_event_exchange
   suites:
-  - name: unit
-  - name: system
   - name: config_schema
+  - name: system
+  - name: unit
+
 - name: rabbitmq_federation
   skip_dialyzer: true
   suites:
-  - name: unit_inbroker
-  - name: restart_federation_link_command
-  - name: rabbit_federation_status
+  - name: exchange
   - name: federation_status_command
-  - name: unit
   - name: queue
-  - name: exchange
+  - name: rabbit_federation_status
+  - name: restart_federation_link_command
+  - name: unit
+  - name: unit_inbroker
+
 - name: rabbitmq_federation_management
   suites:
   - name: federation_mgmt
+
 - name: rabbitmq_jms_topic_exchange
   skip_dialyzer: true
   suites:
-  - name: sjx_evaluation
   - name: rjms_topic_selector
   - name: rjms_topic_selector_unit
+  - name: sjx_evaluation
+
 - name: rabbitmq_management
   skip_dialyzer: true
   suites:
   - name: cache
-  - name: stats
-  - name: rabbit_mgmt_rabbitmqadmin
+  - name: clustering
+  - name: clustering_prop
+  - name: config_schema
   - name: listener_config
-  - name: rabbit_mgmt_test_db
+  - name: rabbit_mgmt_http
+  - name: rabbit_mgmt_http_health_checks
   - name: rabbit_mgmt_only_http
+  - name: rabbit_mgmt_rabbitmqadmin
   - name: rabbit_mgmt_stats
+  - name: rabbit_mgmt_test_db
   - name: rabbit_mgmt_test_unit
-  - name: rabbit_mgmt_http
-  - name: clustering_prop
-  - name: clustering
-  - name: config_schema
+  - name: stats
+
 - name: rabbitmq_management_agent
   skip_dialyzer: true
   suites:
-  - name: metrics
   - name: exometer_slide
+  - name: metrics
   - name: rabbit_mgmt_gc
   - name: rabbit_mgmt_slide
+
 - name: rabbitmq_mqtt
   skip_dialyzer: true
   skip_tests: true
   suites:
-  - name: util
-  - name: retainer
-  - name: proxy_protocol
-  - name: command
-  - name: reader
-  - name: mqtt_machine
-  - name: processor
-  - name: java
   - name: auth
   - name: cluster
+  - name: command
   - name: config_schema
+  - name: java
+  - name: mqtt_machine
+  - name: processor
+  - name: proxy_protocol
+  - name: reader
+  - name: retainer
+  - name: util
+
 - name: rabbitmq_peer_discovery_common
   suites:
   - name: config_schema
+
 - name: rabbitmq_peer_discovery_aws
   skip_dialyzer: true
   skip_tests: true
   suites:
-  - name: rabbitmq_peer_discovery_aws
-  - name: integration
   - name: config_schema
+  - name: integration
+  - name: rabbitmq_peer_discovery_aws
+
 - name: rabbitmq_peer_discovery_k8s
   skip_dialyzer: true
   suites:
-  - name: rabbitmq_peer_discovery_k8s
   - name: config_schema
+  - name: rabbitmq_peer_discovery_k8s
+
 - name: rabbitmq_peer_discovery_consul
   skip_dialyzer: true
   suites:
-  - name: rabbitmq_peer_discovery_consul
   - name: config_schema
+  - name: rabbitmq_peer_discovery_consul
+
 - name: rabbitmq_peer_discovery_etcd
   skip_dialyzer: true
   skip_tests: true
   suites:
-  - name: unit
-  - name: system
   - name: config_schema
+  - name: system
+  - name: unit
+
 - name: rabbitmq_prometheus
   skip_dialyzer: true
   suites:
-  - name: rabbit_prometheus_http
   - name: config_schema
+  - name: rabbit_prometheus_http
+
 - name: rabbitmq_random_exchange
   suites: []
+
 - name: rabbitmq_recent_history_exchange
   skip_dialyzer: true
   suites:
   - name: system
+
 - name: rabbitmq_sharding
   skip_dialyzer: true
   suites: []
+
 - name: rabbitmq_shovel
   skip_dialyzer: true
   suites:
+  - name: amqp10
+  - name: amqp10_dynamic
   - name: amqp10_shovel
+  - name: config
   - name: configuration
+  - name: delete_shovel_command
   - name: dynamic
   - name: parameters
-  - name: config
   - name: shovel_status_command
-  - name: delete_shovel_command
-  - name: amqp10_dynamic
-  - name: amqp10
+
 - name: rabbitmq_shovel_management
   suites:
   - name: http
+
 - name: rabbitmq_stomp
   skip_dialyzer: true
   suites:
-  - name: util
-  - name: proxy_protocol
   - name: amqqueue
   - name: command
-  - name: topic
+  - name: config_schema
+  - name: connections
   - name: frame
+  - name: proxy_protocol
   - name: python
-  - name: connections
-  - name: config_schema
+  - name: topic
+  - name: util
+
 - name: rabbitmq_stream
   suites:
   - name: command
   - name: config_schema
   - name: rabbit_stream
+
 - name: rabbitmq_top
   suites: []
+
 - name: rabbitmq_tracing
   suites:
   - name: rabbit_tracing
+
 - name: rabbitmq_trust_store
   skip_dialyzer: true
   suites:
-  - name: system
   - name: config_schema
+  - name: system
+
 - name: rabbitmq_web_dispatch
   skip_dialyzer: true
   suites:
   - name: rabbit_web_dispatch
   - name: rabbit_web_dispatch_unit
+
 - name: rabbitmq_web_mqtt
   skip_dialyzer: true
   suites:
-  - name: proxy_protocol
   - name: config_schema
+  - name: proxy_protocol
+
 - name: rabbitmq_web_mqtt_examples
   suites: []
+
 - name: rabbitmq_web_stomp
   skip_dialyzer: true
   suites:
+  - name: amqp_stomp
+  - name: config_schema
+  - name: cowboy_websocket
   - name: proxy_protocol
   - name: raw_websocket
-  - name: cowboy_websocket
   - name: unit
-  - name: config_schema
-  - name: amqp_stomp
+
 - name: rabbitmq_web_stomp_examples
   suites: []