From 0b6f7e2d2f43a3c424709c93f2c4e00ee6cc7306 Mon Sep 17 00:00:00 2001 From: Sam Salisbury Date: Mon, 26 Apr 2021 13:36:15 +0100 Subject: [PATCH] packagespec upgrade -version 0.2.4 (master) (#11461) * packagespec upgrade -version 0.2.4 * upgrade circleci-multi-file-config * make ci-config --- .circleci/Makefile | 10 +++++++++ .circleci/config.yml | 34 ++++++++++++++--------------- .circleci/config/@build-release.yml | 34 ++++++++++++++--------------- packages-oss.lock/pkgs.yml | 2 +- 4 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.circleci/Makefile b/.circleci/Makefile index 209155cc2b..db204e8b35 100644 --- a/.circleci/Makefile +++ b/.circleci/Makefile @@ -10,6 +10,14 @@ CONFIG ?= ci-config VERIFY ?= ci-verify CIRCLECI := circleci --skip-update-check +ifeq ($(DEBUG_CIRCLECI_CLI),YES) +CIRCLECI += --debug +endif + +# For config processing, always refer to circleci.com not self-hosted circleci, +# because self-hosted does not currently support the necessary API. +CIRCLECI_CLI_HOST := https://circleci.com +export CIRCLECI_CLI_HOST # Set up some documentation/help message variables. # We do not attempt to install the CircleCI CLI from this Makefile. @@ -70,6 +78,8 @@ define GEN_CONFIG @mv -f $@.tmp $@ endef +# Always re-generate the config, as we can't trust timestamps with git. +.PHONY: $(OUT) $(OUT): $(CONFIG_SOURCE) $(GEN_CONFIG) @echo "$@ updated" diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a0a25da50..36c9c8186a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -111,7 +111,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -189,7 +189,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -267,7 +267,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -357,7 +357,7 @@ jobs: steps: - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -528,7 +528,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -644,7 +644,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -799,7 +799,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1018,7 +1018,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1227,7 +1227,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1305,7 +1305,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1383,7 +1383,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1484,7 +1484,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1846,7 +1846,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1924,7 +1924,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -2002,7 +2002,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -2080,7 +2080,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -2158,7 +2158,7 @@ jobs: version: 19.03.12 - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index 93df8efd70..78c954254f 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -23,7 +23,7 @@ jobs: steps: - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -268,7 +268,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -341,7 +341,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -414,7 +414,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -487,7 +487,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -560,7 +560,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -633,7 +633,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -706,7 +706,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -779,7 +779,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -852,7 +852,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -925,7 +925,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -998,7 +998,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1071,7 +1071,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1144,7 +1144,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1217,7 +1217,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1290,7 +1290,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: @@ -1363,7 +1363,7 @@ jobs: docker_layer_caching: false - add_ssh_keys: fingerprints: - - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - checkout: path: . - run: diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 0c6212b560..45d7018a8a 100644 --- a/packages-oss.lock/pkgs.yml +++ b/packages-oss.lock/pkgs.yml @@ -2,7 +2,7 @@ # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # *** lockid: 146a431e832db58c -packagespec-version: 0.2.2 +packagespec-version: 0.2.4 cache-version: 10 packages: - packagespecid: a8bdeecb59f5f37dc83943709455b9fd277df5f8