diff --git a/.circleci/config.yml b/.circleci/config.yml index c946930deba19..ee7b382a3f4b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,10 +22,10 @@ jobs: key: package-6a272394a37f56f2552603381358e76fbf526b3f-{{checksum ".buildcache/cache-keys/package-6a272394a37f56f2552603381358e76fbf526b3f"}} name: Restore package cache - restore_cache: - key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} name: Restore package cache - restore_cache: - key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}} + key: package-5f4906871c95f1bd78b9b64210b45f2eeeaf97c7-{{checksum ".buildcache/cache-keys/package-5f4906871c95f1bd78b9b64210b45f2eeeaf97c7"}} name: Restore package cache - restore_cache: key: package-63f94793a2dcbcaa157e41b0c2b8335f76cbc7fc-{{checksum ".buildcache/cache-keys/package-63f94793a2dcbcaa157e41b0c2b8335f76cbc7fc"}} @@ -76,20 +76,20 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-e0096d0cd2ca1c5a.yml + command: cp packages*.lock/pkgs.yml lockfile-423447b8bd37d1c3.yml name: Update Lockfile Name - run: - command: tar -czf packages-e0096d0cd2ca1c5a.tar.gz .buildcache/packages lockfile-e0096d0cd2ca1c5a.yml + command: tar -czf packages-423447b8bd37d1c3.tar.gz .buildcache/packages lockfile-423447b8bd37d1c3.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-e0096d0cd2ca1c5a.tar.gz .buildcache/packages/store/*.json lockfile-e0096d0cd2ca1c5a.yml + command: tar -czf meta-423447b8bd37d1c3.tar.gz .buildcache/packages/store/*.json lockfile-423447b8bd37d1c3.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-e0096d0cd2ca1c5a.yml + path: lockfile-423447b8bd37d1c3.yml - store_artifacts: - path: packages-e0096d0cd2ca1c5a.tar.gz + path: packages-423447b8bd37d1c3.tar.gz - store_artifacts: - path: meta-e0096d0cd2ca1c5a.tar.gz + path: meta-423447b8bd37d1c3.tar.gz - store_artifacts: path: .buildcache/packages environment: @@ -182,7 +182,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 2ee966c5768e83a92093c0bc6a2fc6042afe4839 + - PACKAGE_SPEC_ID: 579730d9a8f9ff9fa1664cbf08b45f5ed95126ef steps: - setup_remote_docker: docker_layer_caching: false @@ -196,7 +196,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} name: Restore package cache - run: command: |2 @@ -212,13 +212,13 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_01bb_{{checksum ".buildcache/cache-keys/copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482"}} + key: copy-source_7e82_{{checksum ".buildcache/cache-keys/copy-source-7e825f1c6f1f9f9bd5d3f5f402eb672d5cdc69db"}} keys: - - go-modules_87d5_{{checksum ".buildcache/cache-keys/go-modules-87d5fe370bb634974f7b55a067206409c85d5947"}} - - build-static-assets_c9eb_{{checksum ".buildcache/cache-keys/build-static-assets-c9eb755a774c85539457676828158a137604f20d"}} - - build-ui_f5d8_{{checksum ".buildcache/cache-keys/build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78"}} - - ui-dependencies_ac8b_{{checksum ".buildcache/cache-keys/ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098"}} - - install-yarn_3ec0_{{checksum ".buildcache/cache-keys/install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b"}} + - go-modules_bb33_{{checksum ".buildcache/cache-keys/go-modules-bb3323d17b4c836f4b6c60026d33819d447dfe3c"}} + - build-static-assets_3aa2_{{checksum ".buildcache/cache-keys/build-static-assets-3aa26dea1731f794acb26d678fbeb5aeec1bf488"}} + - build-ui_26a9_{{checksum ".buildcache/cache-keys/build-ui-26a986a756dd09ad76b230768f6d889c031d6fea"}} + - ui-dependencies_d185_{{checksum ".buildcache/cache-keys/ui-dependencies-d18517ad93450e51a7be46413f3ceeabafa65e71"}} + - install-yarn_8d40_{{checksum ".buildcache/cache-keys/install-yarn-8d402cd7018158a3cb28f4251d8b7508046a2c1c"}} - set-workdir_3310_{{checksum ".buildcache/cache-keys/set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6"}} - install-go-tools_dcaa_{{checksum ".buildcache/cache-keys/install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950"}} - install-go_d552_{{checksum ".buildcache/cache-keys/install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7"}} @@ -248,7 +248,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} name: Save package cache paths: - .buildcache/packages/store @@ -2533,7 +2533,7 @@ jobs: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' workflows: - build-e0096d0cd2ca1c5a: + build-423447b8bd37d1c3: jobs: - build-common-layers - darwin_amd64_package: diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index 11a6992e60d2d..24e33c375cd87 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -241,10 +241,10 @@ jobs: key: package-6a272394a37f56f2552603381358e76fbf526b3f-{{checksum ".buildcache/cache-keys/package-6a272394a37f56f2552603381358e76fbf526b3f"}} name: Restore package cache - restore_cache: - key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} name: Restore package cache - restore_cache: - key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}} + key: package-5f4906871c95f1bd78b9b64210b45f2eeeaf97c7-{{checksum ".buildcache/cache-keys/package-5f4906871c95f1bd78b9b64210b45f2eeeaf97c7"}} name: Restore package cache - restore_cache: key: package-63f94793a2dcbcaa157e41b0c2b8335f76cbc7fc-{{checksum ".buildcache/cache-keys/package-63f94793a2dcbcaa157e41b0c2b8335f76cbc7fc"}} @@ -295,20 +295,20 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-e0096d0cd2ca1c5a.yml + command: cp packages*.lock/pkgs.yml lockfile-423447b8bd37d1c3.yml name: Update Lockfile Name - run: - command: tar -czf packages-e0096d0cd2ca1c5a.tar.gz .buildcache/packages lockfile-e0096d0cd2ca1c5a.yml + command: tar -czf packages-423447b8bd37d1c3.tar.gz .buildcache/packages lockfile-423447b8bd37d1c3.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-e0096d0cd2ca1c5a.tar.gz .buildcache/packages/store/*.json lockfile-e0096d0cd2ca1c5a.yml + command: tar -czf meta-423447b8bd37d1c3.tar.gz .buildcache/packages/store/*.json lockfile-423447b8bd37d1c3.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-e0096d0cd2ca1c5a.yml + path: lockfile-423447b8bd37d1c3.yml - store_artifacts: - path: packages-e0096d0cd2ca1c5a.tar.gz + path: packages-423447b8bd37d1c3.tar.gz - store_artifacts: - path: meta-e0096d0cd2ca1c5a.tar.gz + path: meta-423447b8bd37d1c3.tar.gz - store_artifacts: path: .buildcache/packages darwin_amd64_package: @@ -383,7 +383,7 @@ jobs: key: package-6a272394a37f56f2552603381358e76fbf526b3f-{{checksum ".buildcache/cache-keys/package-6a272394a37f56f2552603381358e76fbf526b3f"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 2ffbc24c482a71c7f16a87ad5cc6c01038544fe3 + PACKAGE_SPEC_ID: 6a272394a37f56f2552603381358e76fbf526b3f darwin_arm64_package: executor: builder steps: @@ -399,7 +399,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} name: Restore package cache - run: command: |2 @@ -415,13 +415,13 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_01bb_{{checksum ".buildcache/cache-keys/copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482"}} + key: copy-source_7e82_{{checksum ".buildcache/cache-keys/copy-source-7e825f1c6f1f9f9bd5d3f5f402eb672d5cdc69db"}} keys: - - go-modules_87d5_{{checksum ".buildcache/cache-keys/go-modules-87d5fe370bb634974f7b55a067206409c85d5947"}} - - build-static-assets_c9eb_{{checksum ".buildcache/cache-keys/build-static-assets-c9eb755a774c85539457676828158a137604f20d"}} - - build-ui_f5d8_{{checksum ".buildcache/cache-keys/build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78"}} - - ui-dependencies_ac8b_{{checksum ".buildcache/cache-keys/ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098"}} - - install-yarn_3ec0_{{checksum ".buildcache/cache-keys/install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b"}} + - go-modules_bb33_{{checksum ".buildcache/cache-keys/go-modules-bb3323d17b4c836f4b6c60026d33819d447dfe3c"}} + - build-static-assets_3aa2_{{checksum ".buildcache/cache-keys/build-static-assets-3aa26dea1731f794acb26d678fbeb5aeec1bf488"}} + - build-ui_26a9_{{checksum ".buildcache/cache-keys/build-ui-26a986a756dd09ad76b230768f6d889c031d6fea"}} + - ui-dependencies_d185_{{checksum ".buildcache/cache-keys/ui-dependencies-d18517ad93450e51a7be46413f3ceeabafa65e71"}} + - install-yarn_8d40_{{checksum ".buildcache/cache-keys/install-yarn-8d402cd7018158a3cb28f4251d8b7508046a2c1c"}} - set-workdir_3310_{{checksum ".buildcache/cache-keys/set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6"}} - install-go-tools_dcaa_{{checksum ".buildcache/cache-keys/install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950"}} - install-go_d552_{{checksum ".buildcache/cache-keys/install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7"}} @@ -453,10 +453,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + key: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 2ee966c5768e83a92093c0bc6a2fc6042afe4839 + PACKAGE_SPEC_ID: 579730d9a8f9ff9fa1664cbf08b45f5ed95126ef freebsd_386_package: executor: builder steps: @@ -1480,7 +1480,7 @@ jobs: environment: PACKAGE_SPEC_ID: fd42b02886ce62ae770d7c3c08ea50a387593a1f workflows: - build-e0096d0cd2ca1c5a: + build-423447b8bd37d1c3: jobs: - build-common-layers: {} - darwin_amd64_package: diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index b66f991eec3d9..2a7144e2ca27e 100644 --- a/packages-oss.lock/pkgs.yml +++ b/packages-oss.lock/pkgs.yml @@ -1,7 +1,7 @@ # *** # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # *** -lockid: e0096d0cd2ca1c5a +lockid: 423447b8bd37d1c3 packagespec-version: 0.2.7 cache-version: 10 packages: @@ -73,7 +73,7 @@ packages: path: vault_0.0.0-snapshot_darwin_amd64.zip - type: public-hc-releases path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_amd64.zip - - packagespecid: 2ee966c5768e83a92093c0bc6a2fc6042afe4839 + - packagespecid: 579730d9a8f9ff9fa1664cbf08b45f5ed95126ef inputs: BINARY_NAME: vault CGO_ENABLED: "0" @@ -91,23 +91,23 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 09-copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482 - archive: .buildcache/archives/09-copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482.tar.gz + name: 09-copy-source-7e825f1c6f1f9f9bd5d3f5f402eb672d5cdc69db + archive: .buildcache/archives/09-copy-source-7e825f1c6f1f9f9bd5d3f5f402eb672d5cdc69db.tar.gz - type: go-modules - name: 08-go-modules-87d5fe370bb634974f7b55a067206409c85d5947 - archive: .buildcache/archives/08-go-modules-87d5fe370bb634974f7b55a067206409c85d5947.tar.gz + name: 08-go-modules-bb3323d17b4c836f4b6c60026d33819d447dfe3c + archive: .buildcache/archives/08-go-modules-bb3323d17b4c836f4b6c60026d33819d447dfe3c.tar.gz - type: build-static-assets - name: 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d - archive: .buildcache/archives/07-build-static-assets-c9eb755a774c85539457676828158a137604f20d.tar.gz + name: 07-build-static-assets-3aa26dea1731f794acb26d678fbeb5aeec1bf488 + archive: .buildcache/archives/07-build-static-assets-3aa26dea1731f794acb26d678fbeb5aeec1bf488.tar.gz - type: build-ui - name: 06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78 - archive: .buildcache/archives/06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78.tar.gz + name: 06-build-ui-26a986a756dd09ad76b230768f6d889c031d6fea + archive: .buildcache/archives/06-build-ui-26a986a756dd09ad76b230768f6d889c031d6fea.tar.gz - type: ui-dependencies - name: 05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098 - archive: .buildcache/archives/05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098.tar.gz + name: 05-ui-dependencies-d18517ad93450e51a7be46413f3ceeabafa65e71 + archive: .buildcache/archives/05-ui-dependencies-d18517ad93450e51a7be46413f3ceeabafa65e71.tar.gz - type: install-yarn - name: 04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b - archive: .buildcache/archives/04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b.tar.gz + name: 04-install-yarn-8d402cd7018158a3cb28f4251d8b7508046a2c1c + archive: .buildcache/archives/04-install-yarn-8d402cd7018158a3cb28f4251d8b7508046a2c1c.tar.gz - type: set-workdir name: 03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6 archive: .buildcache/archives/03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6.tar.gz @@ -120,28 +120,28 @@ packages: - type: base name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839 + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef POST_PROCESSORS: apple-notarize av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_01bb_{{checksum ".buildcache/cache-keys/copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482"}} - - go-modules_87d5_{{checksum ".buildcache/cache-keys/go-modules-87d5fe370bb634974f7b55a067206409c85d5947"}} - - build-static-assets_c9eb_{{checksum ".buildcache/cache-keys/build-static-assets-c9eb755a774c85539457676828158a137604f20d"}} - - build-ui_f5d8_{{checksum ".buildcache/cache-keys/build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78"}} - - ui-dependencies_ac8b_{{checksum ".buildcache/cache-keys/ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098"}} - - install-yarn_3ec0_{{checksum ".buildcache/cache-keys/install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b"}} + - copy-source_7e82_{{checksum ".buildcache/cache-keys/copy-source-7e825f1c6f1f9f9bd5d3f5f402eb672d5cdc69db"}} + - go-modules_bb33_{{checksum ".buildcache/cache-keys/go-modules-bb3323d17b4c836f4b6c60026d33819d447dfe3c"}} + - build-static-assets_3aa2_{{checksum ".buildcache/cache-keys/build-static-assets-3aa26dea1731f794acb26d678fbeb5aeec1bf488"}} + - build-ui_26a9_{{checksum ".buildcache/cache-keys/build-ui-26a986a756dd09ad76b230768f6d889c031d6fea"}} + - ui-dependencies_d185_{{checksum ".buildcache/cache-keys/ui-dependencies-d18517ad93450e51a7be46413f3ceeabafa65e71"}} + - install-yarn_8d40_{{checksum ".buildcache/cache-keys/install-yarn-8d402cd7018158a3cb28f4251d8b7508046a2c1c"}} - set-workdir_3310_{{checksum ".buildcache/cache-keys/set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6"}} - install-go-tools_dcaa_{{checksum ".buildcache/cache-keys/install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950"}} - install-go_d552_{{checksum ".buildcache/cache-keys/install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7"}} - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} - PACKAGE_CACHE_KEY: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}} + PACKAGE_CACHE_KEY: package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef-{{checksum ".buildcache/cache-keys/package-579730d9a8f9ff9fa1664cbf08b45f5ed95126ef"}} build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/sdk/version; GO111MODULE=on go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault aliases: - type: local path: vault_0.0.0-snapshot_darwin_arm64.zip - type: public-hc-releases path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_arm64.zip - - packagespecid: 61f4e059780eac8772bed584d10749860f2fdce1 + - packagespecid: 5f4906871c95f1bd78b9b64210b45f2eeeaf97c7 inputs: BINARY_NAME: vault CGO_ENABLED: "0"