From addbdd1f95245f403c855e5f8871a46fbf4c8aa5 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Fri, 9 Apr 2021 09:53:03 -0500 Subject: [PATCH] Darwin/ARM64 build target (#11321) * Update to Go 1.16.2 for build/dev * Update SDK version_base * 1st attempt * Update docker images * wip * wip --- .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 + scripts/build.sh | 2 +- 6 files changed, 401 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e8f3a1125..9a0a25da50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,9 @@ jobs: - restore_cache: key: package-a8bdeecb59f5f37dc83943709455b9fd277df5f8-{{checksum ".buildcache/cache-keys/package-a8bdeecb59f5f37dc83943709455b9fd277df5f8"}} name: Restore package cache + - restore_cache: + key: package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + name: Restore package cache - restore_cache: key: package-26548a1820e022c07891751a5b3d80a890a7e0d8-{{checksum ".buildcache/cache-keys/package-26548a1820e022c07891751a5b3d80a890a7e0d8"}} 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-70f9f741143d5305.yml + command: cp packages*.lock/pkgs.yml lockfile-146a431e832db58c.yml name: Update Lockfile Name - run: - command: tar -czf packages-70f9f741143d5305.tar.gz .buildcache/packages lockfile-70f9f741143d5305.yml + command: tar -czf packages-146a431e832db58c.tar.gz .buildcache/packages lockfile-146a431e832db58c.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-70f9f741143d5305.tar.gz .buildcache/packages/store/*.json lockfile-70f9f741143d5305.yml + command: tar -czf meta-146a431e832db58c.tar.gz .buildcache/packages/store/*.json lockfile-146a431e832db58c.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-70f9f741143d5305.yml + path: lockfile-146a431e832db58c.yml - store_artifacts: - path: packages-70f9f741143d5305.tar.gz + path: packages-146a431e832db58c.tar.gz - store_artifacts: - path: meta-70f9f741143d5305.tar.gz + path: meta-146a431e832db58c.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: 6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c + steps: + - setup_remote_docker: + docker_layer_caching: false + version: 19.03.12 + - add_ssh_keys: + fingerprints: + - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - checkout: + path: . + - run: + command: make -C packages*.lock write-package-cache-key + name: Write package cache key + - restore_cache: + key: package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + 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_4c1e_{{checksum ".buildcache/cache-keys/copy-source-4c1ebdd7e5676d7830250c9ccb4600e937128808"}} + keys: + - warm-go-build-vendor-cache_33b0_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-33b04d5c76259ee7c98c82d08215552a97c76439"}} + - build-static-assets_9ad4_{{checksum ".buildcache/cache-keys/build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63"}} + - build-ui_3f5e_{{checksum ".buildcache/cache-keys/build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47"}} + - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}} + - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}} + - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}} + - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}} + - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} + - 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-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + name: Save package cache + paths: + - .buildcache/packages/store windows_386_package: docker: - image: docker.mirror.hashicorp.services/circleci/buildpack-deps @@ -2347,7 +2428,7 @@ jobs: - GO_TAGS: '' - GO111MODULE: 'off' workflows: - build-70f9f741143d5305: + build-146a431e832db58c: jobs: - build-common-layers - darwin_amd64_package: @@ -2356,6 +2437,7 @@ workflows: - bundle-releases: requires: - darwin_amd64_package + - darwin_arm64_package - freebsd_386_package - freebsd_amd64_package - freebsd_arm_package @@ -2370,6 +2452,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 6c3110777c..93df8efd70 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -189,6 +189,9 @@ jobs: - restore_cache: key: package-a8bdeecb59f5f37dc83943709455b9fd277df5f8-{{checksum ".buildcache/cache-keys/package-a8bdeecb59f5f37dc83943709455b9fd277df5f8"}} name: Restore package cache + - restore_cache: + key: package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + name: Restore package cache - restore_cache: key: package-26548a1820e022c07891751a5b3d80a890a7e0d8-{{checksum ".buildcache/cache-keys/package-26548a1820e022c07891751a5b3d80a890a7e0d8"}} 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-70f9f741143d5305.yml + command: cp packages*.lock/pkgs.yml lockfile-146a431e832db58c.yml name: Update Lockfile Name - run: - command: tar -czf packages-70f9f741143d5305.tar.gz .buildcache/packages lockfile-70f9f741143d5305.yml + command: tar -czf packages-146a431e832db58c.tar.gz .buildcache/packages lockfile-146a431e832db58c.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-70f9f741143d5305.tar.gz .buildcache/packages/store/*.json lockfile-70f9f741143d5305.yml + command: tar -czf meta-146a431e832db58c.tar.gz .buildcache/packages/store/*.json lockfile-146a431e832db58c.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-70f9f741143d5305.yml + path: lockfile-146a431e832db58c.yml - store_artifacts: - path: packages-70f9f741143d5305.tar.gz + path: packages-146a431e832db58c.tar.gz - store_artifacts: - path: meta-70f9f741143d5305.tar.gz + path: meta-146a431e832db58c.tar.gz - store_artifacts: path: .buildcache/packages darwin_amd64_package: @@ -330,6 +333,79 @@ jobs: name: Save package cache environment: PACKAGE_SPEC_ID: a8bdeecb59f5f37dc83943709455b9fd277df5f8 + darwin_arm64_package: + executor: builder + steps: + - setup_remote_docker: + version: 19.03.12 + docker_layer_caching: false + - add_ssh_keys: + fingerprints: + - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - checkout: + path: . + - run: + command: make -C packages*.lock write-package-cache-key + name: Write package cache key + - restore_cache: + key: package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + 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_4c1e_{{checksum ".buildcache/cache-keys/copy-source-4c1ebdd7e5676d7830250c9ccb4600e937128808"}} + keys: + - warm-go-build-vendor-cache_33b0_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-33b04d5c76259ee7c98c82d08215552a97c76439"}} + - build-static-assets_9ad4_{{checksum ".buildcache/cache-keys/build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63"}} + - build-ui_3f5e_{{checksum ".buildcache/cache-keys/build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47"}} + - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}} + - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}} + - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}} + - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}} + - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} + - 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-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + name: Save package cache + environment: + PACKAGE_SPEC_ID: 6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c freebsd_386_package: executor: builder steps: @@ -1353,7 +1429,7 @@ jobs: environment: PACKAGE_SPEC_ID: 4ecc34b0623444ae14f47a9065565cd7e1f7448b workflows: - build-70f9f741143d5305: + build-146a431e832db58c: 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 3fa2857586..88bb93b20e 100755 --- a/packages-oss.lock/layers/layers.mk +++ b/packages-oss.lock/layers/layers.mk @@ -173,6 +173,15 @@ LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_CAC LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_ARCHIVE_FILE := .buildcache/archives/08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56.tar.gz $(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_ID),$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_TYPE),$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-aee12bafb3847bdd3bd9263a616abd102bc0ca56_ARCHIVE_FILE))) +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_ID := 08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_TYPE := warm-go-build-vendor-cache +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_BASE_LAYER := 07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63 +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_SOURCE_INCLUDE := vendor/ +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_SOURCE_EXCLUDE := +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_CACHE_KEY_FILE := .buildcache/cache-keys/warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 +LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_ARCHIVE_FILE := .buildcache/archives/08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2.tar.gz +$(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_ID),$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_TYPE),$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2_ARCHIVE_FILE))) + LAYER_08-warm-go-build-vendor-cache-ccf1623b064c811b42e4ee348a1391c08ad12bd6_ID := 08-warm-go-build-vendor-cache-ccf1623b064c811b42e4ee348a1391c08ad12bd6 LAYER_08-warm-go-build-vendor-cache-ccf1623b064c811b42e4ee348a1391c08ad12bd6_TYPE := warm-go-build-vendor-cache LAYER_08-warm-go-build-vendor-cache-ccf1623b064c811b42e4ee348a1391c08ad12bd6_BASE_LAYER := 07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63 @@ -343,3 +352,12 @@ LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_SOURCE_EXCLUDE := LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0 LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_ARCHIVE_FILE := .buildcache/archives/09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0.tar.gz $(eval $(call LAYER,$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_ID),$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_TYPE),$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_BASE_LAYER),$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_SOURCE_INCLUDE),$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_SOURCE_EXCLUDE),$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_CACHE_KEY_FILE),$(LAYER_09-copy-source-f34c668df862d1d5fe8450a22826fc69ca2252e0_ARCHIVE_FILE))) + +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_ID := 09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7 +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_TYPE := copy-source +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_BASE_LAYER := 08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_SOURCE_INCLUDE := . +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_SOURCE_EXCLUDE := vendor/ ui/ +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7 +LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_ARCHIVE_FILE := .buildcache/archives/09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7.tar.gz +$(eval $(call LAYER,$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_ID),$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_TYPE),$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_BASE_LAYER),$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_SOURCE_INCLUDE),$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_SOURCE_EXCLUDE),$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_CACHE_KEY_FILE),$(LAYER_09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7_ARCHIVE_FILE))) diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 839670dff1..0c6212b560 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: 70f9f741143d5305 +lockid: 146a431e832db58c packagespec-version: 0.2.2 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: 6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c + inputs: + BINARY_NAME: vault + CGO_ENABLED: "0" + GO_VERSION: 1.16.2 + 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-f53251bcf99bfc63ace512d81650e009904cd2b7 + archive: .buildcache/archives/09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7.tar.gz + - type: warm-go-build-vendor-cache + name: 08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + archive: .buildcache/archives/08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2.tar.gz + - type: build-static-assets + name: 07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63 + archive: .buildcache/archives/07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63.tar.gz + - type: build-ui + name: 06-build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47 + archive: .buildcache/archives/06-build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47.tar.gz + - type: ui-dependencies + name: 05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9 + archive: .buildcache/archives/05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9.tar.gz + - type: install-yarn + name: 04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea + archive: .buildcache/archives/04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea.tar.gz + - type: set-workdir + name: 03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67 + archive: .buildcache/archives/03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67.tar.gz + - type: install-go-tools + name: 02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48 + archive: .buildcache/archives/02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48.tar.gz + - type: install-go + name: 01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b + archive: .buildcache/archives/01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b.tar.gz + - type: base + name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c + archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c + POST_PROCESSORS: apple-notarize av-scan + circleci: + BUILDER_CACHE_KEY_PREFIX_LIST: + - copy-source_f532_{{checksum ".buildcache/cache-keys/copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7"}} + - warm-go-build-vendor-cache_af2b_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2"}} + - build-static-assets_9ad4_{{checksum ".buildcache/cache-keys/build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63"}} + - build-ui_3f5e_{{checksum ".buildcache/cache-keys/build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47"}} + - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}} + - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}} + - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}} + - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}} + - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} + - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} + PACKAGE_CACHE_KEY: package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c-{{checksum ".buildcache/cache-keys/package-6d19c35fee4eeaaa71e4d6b5d7f98a4d5284797c"}} + 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: 26548a1820e022c07891751a5b3d80a890a7e0d8 inputs: BINARY_NAME: vault @@ -1393,7 +1461,7 @@ layers: - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}} - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} - childcount: 15 + childcount: 16 - depth: 8 final: false type: warm-go-build-vendor-cache @@ -2153,6 +2221,75 @@ layers: - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} childcount: 1 + - depth: 8 + final: false + type: warm-go-build-vendor-cache + id: af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + name: 08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + parentname: 07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63 + parenttype: build-static-assets + parentid: 9ad4d7bfb12bb41ea259f917763c635da5fece63 + cachekeyfile: .buildcache/cache-keys/warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + sourceinclude: vendor/ + sourceexclude: "" + archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2.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-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + archive: .buildcache/archives/08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2.tar.gz + - type: build-static-assets + name: 07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63 + archive: .buildcache/archives/07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63.tar.gz + - type: build-ui + name: 06-build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47 + archive: .buildcache/archives/06-build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47.tar.gz + - type: ui-dependencies + name: 05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9 + archive: .buildcache/archives/05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9.tar.gz + - type: install-yarn + name: 04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea + archive: .buildcache/archives/04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea.tar.gz + - type: set-workdir + name: 03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67 + archive: .buildcache/archives/03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67.tar.gz + - type: install-go-tools + name: 02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48 + archive: .buildcache/archives/02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48.tar.gz + - type: install-go + name: 01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b + archive: .buildcache/archives/01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b.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_af2b_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2"}} + - build-static-assets_9ad4_{{checksum ".buildcache/cache-keys/build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63"}} + - build-ui_3f5e_{{checksum ".buildcache/cache-keys/build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47"}} + - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}} + - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}} + - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}} + - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}} + - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} + - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} + childcount: 1 - depth: 8 final: false type: warm-go-build-vendor-cache @@ -3374,3 +3511,66 @@ layers: - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} childcount: 0 + - depth: 9 + final: true + type: copy-source + id: f53251bcf99bfc63ace512d81650e009904cd2b7 + name: 09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7 + parentname: 08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + parenttype: warm-go-build-vendor-cache + parentid: af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + cachekeyfile: .buildcache/cache-keys/copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7 + sourceinclude: . + sourceexclude: vendor/ ui/ + archivefile: .buildcache/archives/09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7.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-f53251bcf99bfc63ace512d81650e009904cd2b7 + archive: .buildcache/archives/09-copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7.tar.gz + - type: warm-go-build-vendor-cache + name: 08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2 + archive: .buildcache/archives/08-warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2.tar.gz + - type: build-static-assets + name: 07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63 + archive: .buildcache/archives/07-build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63.tar.gz + - type: build-ui + name: 06-build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47 + archive: .buildcache/archives/06-build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47.tar.gz + - type: ui-dependencies + name: 05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9 + archive: .buildcache/archives/05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9.tar.gz + - type: install-yarn + name: 04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea + archive: .buildcache/archives/04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea.tar.gz + - type: set-workdir + name: 03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67 + archive: .buildcache/archives/03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67.tar.gz + - type: install-go-tools + name: 02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48 + archive: .buildcache/archives/02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48.tar.gz + - type: install-go + name: 01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b + archive: .buildcache/archives/01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b.tar.gz + - type: base + name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c + archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz + circleci: + CACHE_KEY_PREFIX_LIST: + - copy-source_f532_{{checksum ".buildcache/cache-keys/copy-source-f53251bcf99bfc63ace512d81650e009904cd2b7"}} + - warm-go-build-vendor-cache_af2b_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-af2becf2ca6a33eaeb8a516f90cf56512a6552c2"}} + - build-static-assets_9ad4_{{checksum ".buildcache/cache-keys/build-static-assets-9ad4d7bfb12bb41ea259f917763c635da5fece63"}} + - build-ui_3f5e_{{checksum ".buildcache/cache-keys/build-ui-3f5e0479b9b1a145c921617b0e2e0f6c05d5dd47"}} + - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}} + - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}} + - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}} + - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}} + - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}} + - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}} + childcount: 0 diff --git a/packages-oss.yml b/packages-oss.yml index 0fe163c845..e51617213a 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 } diff --git a/scripts/build.sh b/scripts/build.sh index ef7e903589..8984407790 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -33,7 +33,7 @@ fi # Determine the arch/os combos we're building for XC_ARCH=${XC_ARCH:-"386 amd64"} XC_OS=${XC_OS:-linux darwin windows freebsd openbsd netbsd solaris} -XC_OSARCH=${XC_OSARCH:-"linux/386 linux/amd64 linux/arm linux/arm64 darwin/386 darwin/amd64 windows/386 windows/amd64 freebsd/386 freebsd/amd64 freebsd/arm openbsd/386 openbsd/amd64 openbsd/arm netbsd/386 netbsd/amd64 solaris/amd64"} +XC_OSARCH=${XC_OSARCH:-"linux/386 linux/amd64 linux/arm linux/arm64 darwin/386 darwin/amd64 darwin/arm64 windows/386 windows/amd64 freebsd/386 freebsd/amd64 freebsd/arm openbsd/386 openbsd/amd64 openbsd/arm netbsd/386 netbsd/amd64 solaris/amd64"} GOPATH=${GOPATH:-$(${GO_CMD} env GOPATH)} case $(uname) in