luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Enable building darwin arm64 for 1.8.x (#11855) (#12071) 

* Enable building darwin arm64 for 1.8.x (#11855)

* Changelog

Co-authored-by: Vishal Nayak <vishalnayak@users.noreply.github.com>
This commit is contained in:
Scott Miller 2021-07-14 09:26:37 -05:00 committed by GitHub
parent 10f29e0503
commit ec4b1b69d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 337 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
.circleci/config.yml generated
View File

@ -21,6 +21,9 @@ jobs:
- restore_cache: - restore_cache:
key: package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3-{{checksum ".buildcache/cache-keys/package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3"}} key: package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3-{{checksum ".buildcache/cache-keys/package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3"}}
name: Restore package cache name: Restore package cache
- restore_cache:
key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
name: Restore package cache
- restore_cache: - restore_cache:
key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}} key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}}
name: Restore package cache name: Restore package cache
@ -73,20 +76,20 @@ jobs:
command: ls -lahR .buildcache command: ls -lahR .buildcache
name: List Build Cache name: List Build Cache
- run: - run:
command: cp packages*.lock/pkgs.yml lockfile-7d1b28ede60990fa.yml command: cp packages*.lock/pkgs.yml lockfile-e0096d0cd2ca1c5a.yml
name: Update Lockfile Name name: Update Lockfile Name
- run: - run:
command: tar -czf packages-7d1b28ede60990fa.tar.gz .buildcache/packages lockfile-7d1b28ede60990fa.yml command: tar -czf packages-e0096d0cd2ca1c5a.tar.gz .buildcache/packages lockfile-e0096d0cd2ca1c5a.yml
name: Create Raw Package Tarball name: Create Raw Package Tarball
- run: - run:
command: tar -czf meta-7d1b28ede60990fa.tar.gz .buildcache/packages/store/*.json lockfile-7d1b28ede60990fa.yml command: tar -czf meta-e0096d0cd2ca1c5a.tar.gz .buildcache/packages/store/*.json lockfile-e0096d0cd2ca1c5a.yml
name: Create Metadata Tarball name: Create Metadata Tarball
- store_artifacts: - store_artifacts:
path: lockfile-7d1b28ede60990fa.yml path: lockfile-e0096d0cd2ca1c5a.yml
- store_artifacts: - store_artifacts:
path: packages-7d1b28ede60990fa.tar.gz path: packages-e0096d0cd2ca1c5a.tar.gz
- store_artifacts: - store_artifacts:
path: meta-7d1b28ede60990fa.tar.gz path: meta-e0096d0cd2ca1c5a.tar.gz
- store_artifacts: - store_artifacts:
path: .buildcache/packages path: .buildcache/packages
environment: environment:
@ -108,7 +111,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -150,7 +153,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -171,6 +174,84 @@ jobs:
name: Save package cache name: Save package cache
paths: paths:
- .buildcache/packages/store - .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: 2ee966c5768e83a92093c0bc6a2fc6042afe4839
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-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
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_01bb_{{checksum ".buildcache/cache-keys/copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482"}}
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"}}
- 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-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
name: Save package cache
paths:
- .buildcache/packages/store
windows_386_package: windows_386_package:
docker: docker:
- image: docker.mirror.hashicorp.services/circleci/buildpack-deps - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
@ -186,7 +267,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -228,7 +309,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -278,7 +359,7 @@ jobs:
steps: steps:
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -303,7 +384,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -319,7 +400,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -335,7 +416,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -351,7 +432,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -367,7 +448,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -383,7 +464,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -399,7 +480,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -415,7 +496,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -431,7 +512,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -447,7 +528,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -463,7 +544,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -500,7 +581,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -542,7 +623,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -631,7 +712,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -673,7 +754,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -792,7 +873,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -834,7 +915,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1052,7 +1133,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1094,7 +1175,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1302,7 +1383,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1344,7 +1425,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1380,7 +1461,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1422,7 +1503,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1458,7 +1539,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1500,7 +1581,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1559,7 +1640,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1601,7 +1682,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1809,7 +1890,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1851,7 +1932,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1887,7 +1968,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1929,7 +2010,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1965,7 +2046,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -2007,7 +2088,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -2043,7 +2124,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -2085,7 +2166,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -2121,7 +2202,7 @@ jobs:
version: 19.03.12 version: 19.03.12
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -2163,7 +2244,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -2452,7 +2533,7 @@ jobs:
- CIRCLECI_CLI_VERSION: 0.1.5546 - CIRCLECI_CLI_VERSION: 0.1.5546
- GO_TAGS: '' - GO_TAGS: ''
workflows: workflows:
build-7d1b28ede60990fa: build-e0096d0cd2ca1c5a:
jobs: jobs:
- build-common-layers - build-common-layers
- darwin_amd64_package: - darwin_amd64_package:
@ -2461,6 +2542,7 @@ workflows:
- bundle-releases: - bundle-releases:
requires: requires:
- darwin_amd64_package - darwin_amd64_package
- darwin_arm64_package
- freebsd_386_package - freebsd_386_package
- freebsd_amd64_package - freebsd_amd64_package
- freebsd_arm_package - freebsd_arm_package
@ -2475,6 +2557,9 @@ workflows:
- solaris_amd64_package - solaris_amd64_package
- windows_386_package - windows_386_package
- windows_amd64_package - windows_amd64_package
- darwin_arm64_package:
requires:
- build-common-layers
- freebsd_386_package: - freebsd_386_package:
requires: requires:
- build-common-layers - build-common-layers

178
.circleci/config/@build-release.yml
View File

@ -23,7 +23,7 @@ jobs:
steps: steps:
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -48,7 +48,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -64,7 +64,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -80,7 +80,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -96,7 +96,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -112,7 +112,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -128,7 +128,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -144,7 +144,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -160,7 +160,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -176,7 +176,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -192,7 +192,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -208,7 +208,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -240,6 +240,9 @@ jobs:
- restore_cache: - restore_cache:
key: package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3-{{checksum ".buildcache/cache-keys/package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3"}} key: package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3-{{checksum ".buildcache/cache-keys/package-2ffbc24c482a71c7f16a87ad5cc6c01038544fe3"}}
name: Restore package cache name: Restore package cache
- restore_cache:
key: package-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
name: Restore package cache
- restore_cache: - restore_cache:
key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}} key: package-61f4e059780eac8772bed584d10749860f2fdce1-{{checksum ".buildcache/cache-keys/package-61f4e059780eac8772bed584d10749860f2fdce1"}}
name: Restore package cache name: Restore package cache
@ -292,20 +295,20 @@ jobs:
command: ls -lahR .buildcache command: ls -lahR .buildcache
name: List Build Cache name: List Build Cache
- run: - run:
command: cp packages*.lock/pkgs.yml lockfile-7d1b28ede60990fa.yml command: cp packages*.lock/pkgs.yml lockfile-e0096d0cd2ca1c5a.yml
name: Update Lockfile Name name: Update Lockfile Name
- run: - run:
command: tar -czf packages-7d1b28ede60990fa.tar.gz .buildcache/packages lockfile-7d1b28ede60990fa.yml command: tar -czf packages-e0096d0cd2ca1c5a.tar.gz .buildcache/packages lockfile-e0096d0cd2ca1c5a.yml
name: Create Raw Package Tarball name: Create Raw Package Tarball
- run: - run:
command: tar -czf meta-7d1b28ede60990fa.tar.gz .buildcache/packages/store/*.json lockfile-7d1b28ede60990fa.yml command: tar -czf meta-e0096d0cd2ca1c5a.tar.gz .buildcache/packages/store/*.json lockfile-e0096d0cd2ca1c5a.yml
name: Create Metadata Tarball name: Create Metadata Tarball
- store_artifacts: - store_artifacts:
path: lockfile-7d1b28ede60990fa.yml path: lockfile-e0096d0cd2ca1c5a.yml
- store_artifacts: - store_artifacts:
path: packages-7d1b28ede60990fa.tar.gz path: packages-e0096d0cd2ca1c5a.tar.gz
- store_artifacts: - store_artifacts:
path: meta-7d1b28ede60990fa.tar.gz path: meta-e0096d0cd2ca1c5a.tar.gz
- store_artifacts: - store_artifacts:
path: .buildcache/packages path: .buildcache/packages
darwin_amd64_package: darwin_amd64_package:
@ -316,7 +319,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -358,7 +361,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -381,6 +384,79 @@ jobs:
name: Save package cache name: Save package cache
environment: environment:
PACKAGE_SPEC_ID: 2ffbc24c482a71c7f16a87ad5cc6c01038544fe3 PACKAGE_SPEC_ID: 2ffbc24c482a71c7f16a87ad5cc6c01038544fe3
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-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
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_01bb_{{checksum ".buildcache/cache-keys/copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482"}}
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"}}
- 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-2ee966c5768e83a92093c0bc6a2fc6042afe4839-{{checksum ".buildcache/cache-keys/package-2ee966c5768e83a92093c0bc6a2fc6042afe4839"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 2ee966c5768e83a92093c0bc6a2fc6042afe4839
freebsd_386_package: freebsd_386_package:
executor: builder executor: builder
steps: steps:
@ -389,7 +465,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -431,7 +507,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -462,7 +538,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -504,7 +580,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -535,7 +611,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -577,7 +653,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -608,7 +684,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -650,7 +726,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -681,7 +757,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -723,7 +799,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -754,7 +830,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -796,7 +872,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -827,7 +903,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -869,7 +945,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -900,7 +976,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -942,7 +1018,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -973,7 +1049,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1015,7 +1091,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1046,7 +1122,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1088,7 +1164,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1119,7 +1195,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1161,7 +1237,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1192,7 +1268,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1234,7 +1310,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1265,7 +1341,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1307,7 +1383,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1338,7 +1414,7 @@ jobs:
docker_layer_caching: false docker_layer_caching: false
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06 - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
- checkout: - checkout:
path: . path: .
- run: - run:
@ -1380,7 +1456,7 @@ jobs:
- run: - run:
command: |2- command: |2-
KEYFILE="$HOME/.ssh/id_rsa_0e0377f4e2c356c2536a03e131912f06" KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
if [ -f "$KEYFILE" ]; then if [ -f "$KEYFILE" ]; then
ssh-add "$KEYFILE" ssh-add "$KEYFILE"
@ -1404,7 +1480,7 @@ jobs:
environment: environment:
PACKAGE_SPEC_ID: f9c04b6983662af4c2c142b479e371f5964caf09 PACKAGE_SPEC_ID: f9c04b6983662af4c2c142b479e371f5964caf09
workflows: workflows:
build-7d1b28ede60990fa: build-e0096d0cd2ca1c5a:
jobs: jobs:
- build-common-layers: {} - build-common-layers: {}
- darwin_amd64_package: - darwin_amd64_package:
@ -1413,6 +1489,7 @@ workflows:
- bundle-releases: - bundle-releases:
requires: requires:
- darwin_amd64_package - darwin_amd64_package
- darwin_arm64_package
- freebsd_386_package - freebsd_386_package
- freebsd_amd64_package - freebsd_amd64_package
- freebsd_arm_package - freebsd_arm_package
@ -1427,6 +1504,9 @@ workflows:
- solaris_amd64_package - solaris_amd64_package
- windows_386_package - windows_386_package
- windows_amd64_package - windows_amd64_package
- darwin_arm64_package:
requires:
- build-common-layers
- freebsd_386_package: - freebsd_386_package:
requires: requires:
- build-common-layers - build-common-layers

3
changelog/12071.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:feature
core: Add a darwin/arm64 binary release supporting the Apple M1 CPU
```

2
packages-oss.lock/Makefile generated
View File

@ -291,8 +291,6 @@ $(RELEASE_TARGETS):
# QUERY_TARGETS are targets in the release repo that perform queries, and are therefore # QUERY_TARGETS are targets in the release repo that perform queries, and are therefore
# not necessarily bound to a specific PRODUCT_VERSION or PRODUCT_REVISION. # not necessarily bound to a specific PRODUCT_VERSION or PRODUCT_REVISION.
# We still export PRODUCT_VERSION and PRODUCT_REVISION because they can be used as query
# parameters.
QUERY_TARGETS := list-staged-builds list-promoted-builds list-custom-builds watch-ci QUERY_TARGETS := list-staged-builds list-promoted-builds list-custom-builds watch-ci
$(QUERY_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) $(QUERY_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)

72
packages-oss.lock/pkgs.yml generated
View File

@ -1,8 +1,8 @@
# *** # ***
# WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
# *** # ***
lockid: 7d1b28ede60990fa lockid: e0096d0cd2ca1c5a
packagespec-version: 0.2.7 packagespec-version: 0.2.2
cache-version: 10 cache-version: 10
packages: packages:
- packagespecid: 2ffbc24c482a71c7f16a87ad5cc6c01038544fe3 - packagespecid: 2ffbc24c482a71c7f16a87ad5cc6c01038544fe3
@ -73,6 +73,74 @@ packages:
path: vault_0.0.0-snapshot_darwin_amd64.zip path: vault_0.0.0-snapshot_darwin_amd64.zip
- type: public-hc-releases - type: public-hc-releases
path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_amd64.zip path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_amd64.zip
- packagespecid: 2ee966c5768e83a92093c0bc6a2fc6042afe4839
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-01bb587fbaa40eee3270a2dfa7865a8e37dde482
archive: .buildcache/archives/09-copy-source-01bb587fbaa40eee3270a2dfa7865a8e37dde482.tar.gz
- type: go-modules
name: 08-go-modules-87d5fe370bb634974f7b55a067206409c85d5947
archive: .buildcache/archives/08-go-modules-87d5fe370bb634974f7b55a067206409c85d5947.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-2ee966c5768e83a92093c0bc6a2fc6042afe4839
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"}}
- 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"}}
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: 61f4e059780eac8772bed584d10749860f2fdce1
inputs: inputs:
BINARY_NAME: vault BINARY_NAME: vault

1
packages-oss.yml
View File

@ -104,6 +104,7 @@ build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/sdk/version;
# is a useful data source for building CI/CD pipelines. # is a useful data source for building CI/CD pipelines.
packages: packages:
- inputs: { GOOS: darwin, GOARCH: amd64 } - inputs: { GOOS: darwin, GOARCH: amd64 }
- inputs: { GOOS: darwin, GOARCH: arm64 }
- inputs: { GOOS: freebsd, GOARCH: 386 } - inputs: { GOOS: freebsd, GOARCH: 386 }
- inputs: { GOOS: freebsd, GOARCH: amd64 } - inputs: { GOOS: freebsd, GOARCH: amd64 }
- inputs: { GOOS: freebsd, GOARCH: arm } - inputs: { GOOS: freebsd, GOARCH: arm }