diff --git a/.circleci/config.yml b/.circleci/config.yml index 6eb56d15be..77825546c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,7 +138,7 @@ jobs: environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - - PRODUCT_REVISION: '' + - PRODUCT_REVISION: ad364714b47113baf7e87e9a382d03b8f73b896a darwin_amd64_package: docker: - image: circleci/buildpack-deps @@ -146,7 +146,7 @@ jobs: environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - - PRODUCT_REVISION: '' + - PRODUCT_REVISION: ad364714b47113baf7e87e9a382d03b8f73b896a - PACKAGE_SPEC_ID: e743b041278cec53847ec7028ebadc3ad5669de2 steps: - setup_remote_docker: @@ -216,7 +216,7 @@ jobs: environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - - PRODUCT_REVISION: '' + - PRODUCT_REVISION: ad364714b47113baf7e87e9a382d03b8f73b896a - PACKAGE_SPEC_ID: 4f1bfeb2a667fafd083e3110d6ee2a714360a71a steps: - setup_remote_docker: @@ -286,7 +286,7 @@ jobs: environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - - PRODUCT_REVISION: '' + - PRODUCT_REVISION: ad364714b47113baf7e87e9a382d03b8f73b896a - PACKAGE_SPEC_ID: 2a15eca7152565d54650450b74e49f13fa3aa635 steps: - setup_remote_docker: @@ -356,7 +356,7 @@ jobs: environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - - PRODUCT_REVISION: '' + - PRODUCT_REVISION: ad364714b47113baf7e87e9a382d03b8f73b896a - PACKAGE_SPEC_ID: a39b6fcb6a55e71b7a72b2631cff69c1e4943323 steps: - setup_remote_docker: @@ -467,27 +467,27 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-standalone.yml + command: cp packages*.lock/pkgs.yml lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml - store_artifacts: - destination: lockfile-standalone.yml - path: lockfile-standalone.yml + destination: lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml + path: lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml - store_artifacts: - destination: packages-standalone + destination: packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75 path: .buildcache/packages - run: - command: tar -czf packages-standalone.tar.gz .buildcache/packages lockfile-standalone.yml + command: tar -czf packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz .buildcache/packages lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml - store_artifacts: - destination: packages-standalone.tar.gz - path: packages-standalone.tar.gz + destination: packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz + path: packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz - run: - command: tar -czf meta-standalone.tar.gz .buildcache/packages/store/*.json lockfile-standalone.yml + command: tar -czf meta-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz .buildcache/packages/store/*.json lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml - store_artifacts: - destination: meta-standalone.tar.gz - path: meta-standalone.tar.gz + destination: meta-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz + path: meta-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - - PRODUCT_REVISION: '' + - PRODUCT_REVISION: ad364714b47113baf7e87e9a382d03b8f73b896a build: machine: image: ubuntu-1604:201903-01 @@ -629,7 +629,7 @@ jobs: when: always working_directory: ~/boundary workflows: - build-standalone: + build-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75: jobs: - build-common-layers - darwin_amd64_package: diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index 984b388a19..0e80aeaff5 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -10,7 +10,7 @@ executors: docker: - image: circleci/buildpack-deps environment: - PRODUCT_REVISION: "" + PRODUCT_REVISION: "ad364714b47113baf7e87e9a382d03b8f73b896a" AUTO_INSTALL_TOOLS: 'YES' BUILDKIT_PROGRESS: plain shell: /usr/bin/env bash -euo pipefail -c @@ -19,14 +19,14 @@ executors: image: ubuntu-1604:202007-01 resource_class: xlarge environment: - PRODUCT_REVISION: "" + PRODUCT_REVISION: "ad364714b47113baf7e87e9a382d03b8f73b896a" AUTO_INSTALL_TOOLS: 'YES' BUILDKIT_PROGRESS: plain shell: /usr/bin/env bash -euo pipefail -c workflows: version: 2 - build-standalone: + build-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75: jobs: - build-common-layers - darwin_amd64_package: { requires: [ build-common-layers ] } @@ -512,30 +512,30 @@ jobs: command: ls -lahR .buildcache # Give the lockfile a name store_artifacts can work with. - - run: cp packages*.lock/pkgs.yml lockfile-standalone.yml + - run: cp packages*.lock/pkgs.yml lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml # Surface the lock file as an artifact. - store_artifacts: - path: lockfile-standalone.yml - destination: lockfile-standalone.yml + path: lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml + destination: lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml # Surface the package store directory as an artifact. # This makes each zipped package separately downloadable. - store_artifacts: path: .buildcache/packages - destination: packages-standalone + destination: packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75 # Surface a tarball of the whole package store plus lockfile as an artifact. - - run: tar -czf packages-standalone.tar.gz .buildcache/packages lockfile-standalone.yml + - run: tar -czf packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz .buildcache/packages lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml - store_artifacts: - path: packages-standalone.tar.gz - destination: packages-standalone.tar.gz + path: packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz + destination: packages-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz # Surface a tarball of just the metadata files. - - run: tar -czf meta-standalone.tar.gz .buildcache/packages/store/*.json lockfile-standalone.yml + - run: tar -czf meta-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz .buildcache/packages/store/*.json lockfile-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.yml - store_artifacts: - path: meta-standalone.tar.gz - destination: meta-standalone.tar.gz + path: meta-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz + destination: meta-ad364714b47113baf7e87e9a382d03b8f73b896a-93a6ac5d68844c75.tar.gz commands: load-darwin_amd64_package: