From cb62cc0592cd801611533eaca150bfbb78380450 Mon Sep 17 00:00:00 2001 From: Vishal Nayak Date: Mon, 14 Jun 2021 11:27:12 -0400 Subject: [PATCH] Enable building darwin arm64 for 1.8.x --- .circleci/config.yml | 99 +++++++++++++- .circleci/config/@build-release.yml | 94 ++++++++++++- packages-oss.lock/layers/layers.mk | 18 +++ packages-oss.lock/pkgs.yml | 204 +++++++++++++++++++++++++++- packages-oss.yml | 1 + 5 files changed, 400 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d42f8e53e24..f2a98cd40921 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,9 @@ jobs: - restore_cache: key: package-698c8e61139af0052def2a22ec3b11f3a898fced-{{checksum ".buildcache/cache-keys/package-698c8e61139af0052def2a22ec3b11f3a898fced"}} name: Restore package cache + - restore_cache: + key: package-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + name: Restore package cache - restore_cache: key: package-28df722aea37cda517217149b228da46ed38252b-{{checksum ".buildcache/cache-keys/package-28df722aea37cda517217149b228da46ed38252b"}} name: Restore package cache @@ -73,20 +76,20 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-768c55e277d9c386.yml + command: cp packages*.lock/pkgs.yml lockfile-359655c4b34ac8aa.yml name: Update Lockfile Name - run: - command: tar -czf packages-768c55e277d9c386.tar.gz .buildcache/packages lockfile-768c55e277d9c386.yml + command: tar -czf packages-359655c4b34ac8aa.tar.gz .buildcache/packages lockfile-359655c4b34ac8aa.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-768c55e277d9c386.tar.gz .buildcache/packages/store/*.json lockfile-768c55e277d9c386.yml + command: tar -czf meta-359655c4b34ac8aa.tar.gz .buildcache/packages/store/*.json lockfile-359655c4b34ac8aa.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-768c55e277d9c386.yml + path: lockfile-359655c4b34ac8aa.yml - store_artifacts: - path: packages-768c55e277d9c386.tar.gz + path: packages-359655c4b34ac8aa.tar.gz - store_artifacts: - path: meta-768c55e277d9c386.tar.gz + path: meta-359655c4b34ac8aa.tar.gz - store_artifacts: path: .buildcache/packages environment: @@ -171,6 +174,84 @@ jobs: name: Save package cache paths: - .buildcache/packages/store + darwin_arm64_package: + docker: + - image: docker.mirror.hashicorp.services/circleci/buildpack-deps + shell: /usr/bin/env bash -euo pipefail -c + environment: + - AUTO_INSTALL_TOOLS: 'YES' + - BUILDKIT_PROGRESS: plain + - PRODUCT_REVISION: '' + - PACKAGE_SPEC_ID: c913da3565fc647c10e30a59f3068fb5246290d6 + steps: + - setup_remote_docker: + docker_layer_caching: false + version: 19.03.12 + - add_ssh_keys: + fingerprints: + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 + - checkout: + path: . + - run: + command: make -C packages*.lock write-package-cache-key + name: Write package cache key + - restore_cache: + key: package-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + name: Restore package cache + - run: + command: |2 + + if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then + echo "No package found, continuing with build." + exit 0 + fi + echo "Package already cached, skipping build." + circleci-agent step halt + name: Check cache status + - run: + command: make -C packages*.lock write-builder-cache-keys + name: Write builder layer cache keys + - restore_cache: + key: copy-source_e181_{{checksum ".buildcache/cache-keys/copy-source-e18103b8a9dccb1985f9cdddfaed67366ff60ffc"}} + keys: + - warm-go-build-vendor-cache_b6eb_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-b6ebaa0ab6960fccecc15430e6fc5ff75b26414a"}} + - 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"}} + - 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"}} + name: 'Restore Builder Image Cache: copy-source' + - run: + command: make -C packages*.lock load-builder-cache + name: Load whatever builder cache we have (if any) into the Docker daemon + no_output_timeout: 30m + - run: + command: |2- + + KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98" + eval "$(ssh-agent -s)" + if [ -f "$KEYFILE" ]; then + ssh-add "$KEYFILE" + else + echo "==> INFO: SSH key for github.com not found" + echo " Attempts to access private repositories from within" + echo " the build will fail, e.g. for private go modules, or" + echo " attempts to directly clone private repositories." + fi + + make -C packages*.lock package + name: Compile Package + - run: + command: ls -lahR .buildcache/packages + name: List packages + - save_cache: + key: package-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + name: Save package cache + paths: + - .buildcache/packages/store windows_386_package: docker: - image: docker.mirror.hashicorp.services/circleci/buildpack-deps @@ -2407,7 +2488,7 @@ jobs: - GO_TAGS: '' - GO111MODULE: 'off' workflows: - build-768c55e277d9c386: + build-359655c4b34ac8aa: jobs: - build-common-layers - darwin_amd64_package: @@ -2416,6 +2497,7 @@ workflows: - bundle-releases: requires: - darwin_amd64_package + - darwin_arm64_package - freebsd_386_package - freebsd_amd64_package - freebsd_arm_package @@ -2430,6 +2512,9 @@ workflows: - solaris_amd64_package - windows_386_package - windows_amd64_package + - darwin_arm64_package: + requires: + - build-common-layers - freebsd_386_package: requires: - build-common-layers diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index 50433a0ab505..acd3dff05f12 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -189,6 +189,9 @@ jobs: - restore_cache: key: package-698c8e61139af0052def2a22ec3b11f3a898fced-{{checksum ".buildcache/cache-keys/package-698c8e61139af0052def2a22ec3b11f3a898fced"}} name: Restore package cache + - restore_cache: + key: package-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + name: Restore package cache - restore_cache: key: package-28df722aea37cda517217149b228da46ed38252b-{{checksum ".buildcache/cache-keys/package-28df722aea37cda517217149b228da46ed38252b"}} name: Restore package cache @@ -241,20 +244,20 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-768c55e277d9c386.yml + command: cp packages*.lock/pkgs.yml lockfile-359655c4b34ac8aa.yml name: Update Lockfile Name - run: - command: tar -czf packages-768c55e277d9c386.tar.gz .buildcache/packages lockfile-768c55e277d9c386.yml + command: tar -czf packages-359655c4b34ac8aa.tar.gz .buildcache/packages lockfile-359655c4b34ac8aa.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-768c55e277d9c386.tar.gz .buildcache/packages/store/*.json lockfile-768c55e277d9c386.yml + command: tar -czf meta-359655c4b34ac8aa.tar.gz .buildcache/packages/store/*.json lockfile-359655c4b34ac8aa.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-768c55e277d9c386.yml + path: lockfile-359655c4b34ac8aa.yml - store_artifacts: - path: packages-768c55e277d9c386.tar.gz + path: packages-359655c4b34ac8aa.tar.gz - store_artifacts: - path: meta-768c55e277d9c386.tar.gz + path: meta-359655c4b34ac8aa.tar.gz - store_artifacts: path: .buildcache/packages darwin_amd64_package: @@ -330,6 +333,79 @@ jobs: name: Save package cache environment: PACKAGE_SPEC_ID: 698c8e61139af0052def2a22ec3b11f3a898fced + darwin_arm64_package: + executor: builder + steps: + - setup_remote_docker: + version: 19.03.12 + docker_layer_caching: false + - add_ssh_keys: + fingerprints: + - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 + - checkout: + path: . + - run: + command: make -C packages*.lock write-package-cache-key + name: Write package cache key + - restore_cache: + key: package-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + name: Restore package cache + - run: + command: |2 + + if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then + echo "No package found, continuing with build." + exit 0 + fi + echo "Package already cached, skipping build." + circleci-agent step halt + name: Check cache status + - run: + command: make -C packages*.lock write-builder-cache-keys + name: Write builder layer cache keys + - restore_cache: + key: copy-source_e181_{{checksum ".buildcache/cache-keys/copy-source-e18103b8a9dccb1985f9cdddfaed67366ff60ffc"}} + keys: + - warm-go-build-vendor-cache_b6eb_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-b6ebaa0ab6960fccecc15430e6fc5ff75b26414a"}} + - 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"}} + - 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"}} + name: 'Restore Builder Image Cache: copy-source' + - run: + command: make -C packages*.lock load-builder-cache + name: Load whatever builder cache we have (if any) into the Docker daemon + no_output_timeout: 30m + - run: + command: |2- + + KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98" + eval "$(ssh-agent -s)" + if [ -f "$KEYFILE" ]; then + ssh-add "$KEYFILE" + else + echo "==> INFO: SSH key for github.com not found" + echo " Attempts to access private repositories from within" + echo " the build will fail, e.g. for private go modules, or" + echo " attempts to directly clone private repositories." + fi + + make -C packages*.lock package + name: Compile Package + - run: + command: ls -lahR .buildcache/packages + name: List packages + - save_cache: + paths: + - .buildcache/packages/store + key: package-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + name: Save package cache + environment: + PACKAGE_SPEC_ID: c913da3565fc647c10e30a59f3068fb5246290d6 freebsd_386_package: executor: builder steps: @@ -1353,7 +1429,7 @@ jobs: environment: PACKAGE_SPEC_ID: 5077f12969c8cef1699fd2a68690b5f0ea7c0e55 workflows: - build-768c55e277d9c386: + build-359655c4b34ac8aa: jobs: - build-common-layers: {} - darwin_amd64_package: @@ -1362,6 +1438,7 @@ workflows: - bundle-releases: requires: - darwin_amd64_package + - darwin_arm64_package - freebsd_386_package - freebsd_amd64_package - freebsd_arm_package @@ -1376,6 +1453,9 @@ workflows: - solaris_amd64_package - windows_386_package - windows_amd64_package + - darwin_arm64_package: + requires: + - build-common-layers - freebsd_386_package: requires: - build-common-layers diff --git a/packages-oss.lock/layers/layers.mk b/packages-oss.lock/layers/layers.mk index cc7cfad9d170..38e8d93deb6b 100755 --- a/packages-oss.lock/layers/layers.mk +++ b/packages-oss.lock/layers/layers.mk @@ -101,6 +101,15 @@ LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_CAC LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_ARCHIVE_FILE := .buildcache/archives/08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b.tar.gz $(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_ID),$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_TYPE),$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-67345fd3c9519d4c119bbfd6eac175117c6d517b_ARCHIVE_FILE))) +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_ID := 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_TYPE := warm-go-build-vendor-cache +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_BASE_LAYER := 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_SOURCE_INCLUDE := vendor/ +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_SOURCE_EXCLUDE := +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_CACHE_KEY_FILE := .buildcache/cache-keys/warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe +LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_ARCHIVE_FILE := .buildcache/archives/08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe.tar.gz +$(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_ID),$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_TYPE),$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe_ARCHIVE_FILE))) + LAYER_08-warm-go-build-vendor-cache-7205ac2b1cde45e255f09bb8f28c9264413da9c0_ID := 08-warm-go-build-vendor-cache-7205ac2b1cde45e255f09bb8f28c9264413da9c0 LAYER_08-warm-go-build-vendor-cache-7205ac2b1cde45e255f09bb8f28c9264413da9c0_TYPE := warm-go-build-vendor-cache LAYER_08-warm-go-build-vendor-cache-7205ac2b1cde45e255f09bb8f28c9264413da9c0_BASE_LAYER := 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d @@ -272,6 +281,15 @@ LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_CACHE_KEY_FILE := LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_ARCHIVE_FILE := .buildcache/archives/09-copy-source-781536453171557d744b129f6d47d51471be3482.tar.gz $(eval $(call LAYER,$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_ID),$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_TYPE),$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_BASE_LAYER),$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_SOURCE_INCLUDE),$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_SOURCE_EXCLUDE),$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_CACHE_KEY_FILE),$(LAYER_09-copy-source-781536453171557d744b129f6d47d51471be3482_ARCHIVE_FILE))) +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_ID := 09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_TYPE := copy-source +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_BASE_LAYER := 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_SOURCE_INCLUDE := . +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_SOURCE_EXCLUDE := vendor/ ui/ +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd +LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_ARCHIVE_FILE := .buildcache/archives/09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd.tar.gz +$(eval $(call LAYER,$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_ID),$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_TYPE),$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_BASE_LAYER),$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_SOURCE_INCLUDE),$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_SOURCE_EXCLUDE),$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_CACHE_KEY_FILE),$(LAYER_09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd_ARCHIVE_FILE))) + LAYER_09-copy-source-8679e168877107eaa30ae25753f63ba886c9af46_ID := 09-copy-source-8679e168877107eaa30ae25753f63ba886c9af46 LAYER_09-copy-source-8679e168877107eaa30ae25753f63ba886c9af46_TYPE := copy-source LAYER_09-copy-source-8679e168877107eaa30ae25753f63ba886c9af46_BASE_LAYER := 08-warm-go-build-vendor-cache-7ce8af60948710e6f37de333900c519cb40bebf0 diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 4fbd330b0697..de16c6f250af 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: 768c55e277d9c386 +lockid: 359655c4b34ac8aa packagespec-version: 0.2.6 cache-version: 10 packages: @@ -73,6 +73,74 @@ 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: c913da3565fc647c10e30a59f3068fb5246290d6 + inputs: + BINARY_NAME: vault + CGO_ENABLED: "0" + GO_VERSION: 1.16.5 + GO111MODULE: "off" + GOARCH: arm64 + GOOS: darwin + PRODUCT_VERSION: 0.0.0-snapshot + PRODUCT_VERSION_MMP: 0.0.0 + PRODUCT_VERSION_PRE: snapshot + YARN_VERSION: 1.19.1-1 + meta: + BUILD_JOB_NAME: darwin_arm64_package + BUNDLE_NAME: vault_0.0.0-snapshot + builtin: + BUILD_LAYERS: + - type: copy-source + name: 09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd + archive: .buildcache/archives/09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd.tar.gz + - type: warm-go-build-vendor-cache + name: 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe + archive: .buildcache/archives/08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe.tar.gz + - type: build-static-assets + name: 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d + archive: .buildcache/archives/07-build-static-assets-c9eb755a774c85539457676828158a137604f20d.tar.gz + - type: build-ui + name: 06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78 + archive: .buildcache/archives/06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78.tar.gz + - type: ui-dependencies + name: 05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098 + archive: .buildcache/archives/05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098.tar.gz + - type: install-yarn + name: 04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b + archive: .buildcache/archives/04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b.tar.gz + - type: set-workdir + name: 03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6 + archive: .buildcache/archives/03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6.tar.gz + - type: install-go-tools + name: 02-install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950 + archive: .buildcache/archives/02-install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950.tar.gz + - type: install-go + name: 01-install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7 + archive: .buildcache/archives/01-install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7.tar.gz + - type: base + name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c + archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6 + POST_PROCESSORS: apple-notarize av-scan + circleci: + BUILDER_CACHE_KEY_PREFIX_LIST: + - copy-source_7b38_{{checksum ".buildcache/cache-keys/copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd"}} + - warm-go-build-vendor-cache_6e54_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe"}} + - 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"}} + - 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-c913da3565fc647c10e30a59f3068fb5246290d6-{{checksum ".buildcache/cache-keys/package-c913da3565fc647c10e30a59f3068fb5246290d6"}} + build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; 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: 28df722aea37cda517217149b228da46ed38252b inputs: BINARY_NAME: vault @@ -1393,7 +1461,7 @@ layers: - 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"}} - childcount: 15 + childcount: 16 - depth: 8 final: false type: warm-go-build-vendor-cache @@ -1601,6 +1669,75 @@ layers: - install-go_d552_{{checksum ".buildcache/cache-keys/install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7"}} - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} childcount: 1 + - depth: 8 + final: false + type: warm-go-build-vendor-cache + id: 6e54f4587829661c43162eecaf5b84c467a19efe + name: 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe + parentname: 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d + parenttype: build-static-assets + parentid: c9eb755a774c85539457676828158a137604f20d + cachekeyfile: .buildcache/cache-keys/warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe + sourceinclude: vendor/ + sourceexclude: "" + archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe.tar.gz + dockerfile: |- + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental + ARG BASE_IMAGE + FROM $BASE_IMAGE + COPY . ./ + ENV GOOS=darwin + ENV GOARCH=arm64 + ENV CGO_ENABLED=0 + # Try to build vendored packages. We first filter out packages which report + # errors in 'go list', because trying to run go build ./vendor/... fails early + # if we include them. We also don't care about the exit code here, because + # some of the vendored packages may fail to build, but this won't necessarily + # mean that the final package will fail to build, and we will still get a + # usefully warmed cache. + RUN go list -f '{{.ImportPath}}{{if or .Error .DepsErrors}} ERROR{{end}}' ./vendor/... | grep -v ERROR | xargs go build -v || true + meta: + builtin: + LAYER_LIST: + - type: warm-go-build-vendor-cache + name: 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe + archive: .buildcache/archives/08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe.tar.gz + - type: build-static-assets + name: 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d + archive: .buildcache/archives/07-build-static-assets-c9eb755a774c85539457676828158a137604f20d.tar.gz + - type: build-ui + name: 06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78 + archive: .buildcache/archives/06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78.tar.gz + - type: ui-dependencies + name: 05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098 + archive: .buildcache/archives/05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098.tar.gz + - type: install-yarn + name: 04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b + archive: .buildcache/archives/04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b.tar.gz + - type: set-workdir + name: 03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6 + archive: .buildcache/archives/03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6.tar.gz + - type: install-go-tools + name: 02-install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950 + archive: .buildcache/archives/02-install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950.tar.gz + - type: install-go + name: 01-install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7 + archive: .buildcache/archives/01-install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7.tar.gz + - type: base + name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c + archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz + circleci: + CACHE_KEY_PREFIX_LIST: + - warm-go-build-vendor-cache_6e54_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe"}} + - 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"}} + - 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"}} + childcount: 1 - depth: 8 final: false type: warm-go-build-vendor-cache @@ -2870,6 +3007,69 @@ layers: - install-go_d552_{{checksum ".buildcache/cache-keys/install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7"}} - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} childcount: 0 + - depth: 9 + final: true + type: copy-source + id: 7b38ba64328c9a328af4b55147f41de89aaa13fd + name: 09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd + parentname: 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe + parenttype: warm-go-build-vendor-cache + parentid: 6e54f4587829661c43162eecaf5b84c467a19efe + cachekeyfile: .buildcache/cache-keys/copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd + sourceinclude: . + sourceexclude: vendor/ ui/ + archivefile: .buildcache/archives/09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd.tar.gz + dockerfile: | + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental + ARG BASE_IMAGE + FROM $BASE_IMAGE + COPY . ./ + meta: + builtin: + LAYER_LIST: + - type: copy-source + name: 09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd + archive: .buildcache/archives/09-copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd.tar.gz + - type: warm-go-build-vendor-cache + name: 08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe + archive: .buildcache/archives/08-warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe.tar.gz + - type: build-static-assets + name: 07-build-static-assets-c9eb755a774c85539457676828158a137604f20d + archive: .buildcache/archives/07-build-static-assets-c9eb755a774c85539457676828158a137604f20d.tar.gz + - type: build-ui + name: 06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78 + archive: .buildcache/archives/06-build-ui-f5d8c1975b103bbe13e2841b5e8a5d1a11c96e78.tar.gz + - type: ui-dependencies + name: 05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098 + archive: .buildcache/archives/05-ui-dependencies-ac8be120c6d5a16da43fee57c2cecb19a70f8098.tar.gz + - type: install-yarn + name: 04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b + archive: .buildcache/archives/04-install-yarn-3ec09455a50e67ce0e6b9f03e2cefa3e97333a5b.tar.gz + - type: set-workdir + name: 03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6 + archive: .buildcache/archives/03-set-workdir-331006d1434fd1975dad2affbf71fdbf845d22d6.tar.gz + - type: install-go-tools + name: 02-install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950 + archive: .buildcache/archives/02-install-go-tools-dcaa9bb2de49ba79e84aa2ec9e02018c05e62950.tar.gz + - type: install-go + name: 01-install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7 + archive: .buildcache/archives/01-install-go-d55278f9cd49b917d025adaeed3032cc8b0dc7d7.tar.gz + - type: base + name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c + archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz + circleci: + CACHE_KEY_PREFIX_LIST: + - copy-source_7b38_{{checksum ".buildcache/cache-keys/copy-source-7b38ba64328c9a328af4b55147f41de89aaa13fd"}} + - warm-go-build-vendor-cache_6e54_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-6e54f4587829661c43162eecaf5b84c467a19efe"}} + - 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"}} + - 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"}} + childcount: 0 - depth: 9 final: true type: copy-source diff --git a/packages-oss.yml b/packages-oss.yml index 8444720ab8a4..6704265371fe 100644 --- a/packages-oss.yml +++ b/packages-oss.yml @@ -103,6 +103,7 @@ build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/has # is a useful data source for building CI/CD pipelines. packages: - inputs: { GOOS: darwin, GOARCH: amd64 } + - inputs: { GOOS: darwin, GOARCH: arm64 } - inputs: { GOOS: freebsd, GOARCH: 386 } - inputs: { GOOS: freebsd, GOARCH: amd64 } - inputs: { GOOS: freebsd, GOARCH: arm }