From 4d2d4293b13605f04e2c9de910f4216126c25ee9 Mon Sep 17 00:00:00 2001 From: Sam Salisbury Date: Thu, 8 Oct 2020 12:26:22 +0100 Subject: [PATCH] build: fix go-modules layer (nee "remove meta.POST_PROCESSORS") (#579) * packagespec: remove meta.POST_PROCESSORS - This is no longer needed in the spec file, as post-processor definitions are now standardized and not project-specific, as of Packagespec v0.1.4 * build: include go.{mod,sum} from go submodules --- .circleci/config.yml | 68 +++++++++--------- .circleci/config/@build-release.yml | 68 +++++++++--------- packages-oss.lock/layers/layers.mk | 32 ++++----- packages-oss.lock/pkgs.yml | 105 ++++++++++++++-------------- packages-oss.yml | 9 ++- 5 files changed, 139 insertions(+), 143 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f90b9acfe..776d682f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,14 +20,14 @@ jobs: name: Write builder layer cache keys - restore_cache: keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} name: Restore build image cache - run: command: | - if [ -f .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz ]; then + if [ -f .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz ]; then echo "Exact match found in cache, skipping build." circleci-agent step halt else @@ -36,7 +36,7 @@ jobs: name: Finish early if loaded exact match from cache. - run: command: | - LAYER_SPEC_ID=03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 make -C packages*.lock load-builder-cache + LAYER_SPEC_ID=03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce 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: @@ -85,7 +85,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 02-go-modules-4329169e81f027b85b81899e720217fef865e165-image + make -f packages*.lock/layer.mk 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0-image name: Build go-modules layer - run: command: |2 @@ -101,26 +101,26 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691-image + make -f packages*.lock/layer.mk 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce-image name: Build copy-source layer - run: - command: make -f packages*.lock/layer.mk 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691-save + command: make -f packages*.lock/layer.mk 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce-save name: Export builder image - save_cache: - key: cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} + key: cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} name: Save layer copy-source to cache. paths: - - .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + - .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz - run: - command: mv .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + command: mv .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz name: Prepare layer go-modules for caching - save_cache: - key: cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + key: cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} name: Save layer go-modules to cache. paths: - - .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + - .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - run: - command: mv .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz + command: mv .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz name: Prepare layer ui for caching - save_cache: key: cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} @@ -147,7 +147,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 0f13a5db9132c9350b00e8f221a982e8395b69b4 + - PACKAGE_SPEC_ID: 8ec0a2c34a678cdd7266acb843d426fc3bbcba5a steps: - setup_remote_docker: version: 19.03.12 @@ -159,7 +159,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: cache006-package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}} + key: cache006-package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}} name: Restore package cache - run: command: | @@ -175,8 +175,8 @@ jobs: name: Write builder layer cache keys - restore_cache: keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} name: Restore build layer cache @@ -205,7 +205,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: cache006-package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}} + key: cache006-package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}} name: Saving package cache paths: - .buildcache/packages/store @@ -217,7 +217,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 1a93ce0fa57be896594a31ad452b1f492727c915 + - PACKAGE_SPEC_ID: c898543d0336265a97db0b12aaa6586c8fb9b591 steps: - setup_remote_docker: version: 19.03.12 @@ -229,7 +229,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: cache006-package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}} + key: cache006-package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}} name: Restore package cache - run: command: | @@ -245,8 +245,8 @@ jobs: name: Write builder layer cache keys - restore_cache: keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} name: Restore build layer cache @@ -275,7 +275,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: cache006-package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}} + key: cache006-package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}} name: Saving package cache paths: - .buildcache/packages/store @@ -287,7 +287,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 7c03e0434a3d1cb97495af4e5db40c716584dd5e + - PACKAGE_SPEC_ID: adab0845b4818046d81b158942f2127b0b353975 steps: - setup_remote_docker: version: 19.03.12 @@ -299,7 +299,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: cache006-package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}} + key: cache006-package-adab0845b4818046d81b158942f2127b0b353975-{{checksum ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}} name: Restore package cache - run: command: | @@ -315,8 +315,8 @@ jobs: name: Write builder layer cache keys - restore_cache: keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} name: Restore build layer cache @@ -345,7 +345,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: cache006-package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}} + key: cache006-package-adab0845b4818046d81b158942f2127b0b353975-{{checksum ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}} name: Saving package cache paths: - .buildcache/packages/store @@ -359,28 +359,28 @@ jobs: command: make -C packages*.lock write-all-package-cache-keys name: Write all package cache keys - restore_cache: - key: cache006-package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}} + key: cache006-package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}} - run: command: | make package-meta environment: - PACKAGE_SPEC_ID: 0f13a5db9132c9350b00e8f221a982e8395b69b4 + PACKAGE_SPEC_ID: 8ec0a2c34a678cdd7266acb843d426fc3bbcba5a name: Write package metadata for darwin_amd64_package - restore_cache: - key: cache006-package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}} + key: cache006-package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}} - run: command: | make package-meta environment: - PACKAGE_SPEC_ID: 1a93ce0fa57be896594a31ad452b1f492727c915 + PACKAGE_SPEC_ID: c898543d0336265a97db0b12aaa6586c8fb9b591 name: Write package metadata for linux_amd64_package - restore_cache: - key: cache006-package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}} + key: cache006-package-adab0845b4818046d81b158942f2127b0b353975-{{checksum ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}} - run: command: | make package-meta environment: - PACKAGE_SPEC_ID: 7c03e0434a3d1cb97495af4e5db40c716584dd5e + PACKAGE_SPEC_ID: adab0845b4818046d81b158942f2127b0b353975 name: Write package metadata for windows_amd64_package - run: command: make aliases diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index bf27dc92a..ddbeebb8e 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -52,14 +52,14 @@ jobs: - restore_cache: name: Restore build image cache keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - run: name: Finish early if loaded exact match from cache. command: | - if [ -f .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz ]; then + if [ -f .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz ]; then echo "Exact match found in cache, skipping build." circleci-agent step halt else @@ -69,7 +69,7 @@ jobs: name: Load whatever builder cache we have (if any) into the Docker daemon no_output_timeout: 30m command: | - LAYER_SPEC_ID=03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 make -C packages*.lock load-builder-cache + LAYER_SPEC_ID=03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce make -C packages*.lock load-builder-cache - run: name: Build base layer command: | @@ -117,7 +117,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 02-go-modules-4329169e81f027b85b81899e720217fef865e165-image + make -f packages*.lock/layer.mk 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0-image - run: name: Build copy-source layer command: | @@ -133,27 +133,27 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691-image + make -f packages*.lock/layer.mk 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce-image - run: name: Export builder image - command: make -f packages*.lock/layer.mk 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691-save + command: make -f packages*.lock/layer.mk 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce-save - save_cache: name: Save layer copy-source to cache. - key: cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} + key: cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} paths: - - .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + - .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz - run: name: Prepare layer go-modules for caching - command: mv .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + command: mv .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - save_cache: name: Save layer go-modules to cache. - key: cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + key: cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} paths: - - .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + - .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - run: name: Prepare layer ui for caching - command: mv .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz + command: mv .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz - save_cache: name: Save layer ui to cache. key: cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} @@ -170,7 +170,7 @@ jobs: darwin_amd64_package: executor: builder environment: - - PACKAGE_SPEC_ID: 0f13a5db9132c9350b00e8f221a982e8395b69b4 + - PACKAGE_SPEC_ID: 8ec0a2c34a678cdd7266acb843d426fc3bbcba5a steps: - setup_remote_docker: @@ -188,7 +188,7 @@ jobs: - write-package-cache-key - restore_cache: name: Restore package cache - key: 'cache006-package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}}' + key: 'cache006-package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}}' - run: name: Check the cache status. command: | @@ -204,8 +204,8 @@ jobs: - restore_cache: name: Restore build layer cache keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - run: @@ -236,7 +236,7 @@ jobs: command: ls -lahR .buildcache/packages - save_cache: name: Saving package cache - key: 'cache006-package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}}' + key: 'cache006-package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}}' paths: - .buildcache/packages/store # Save builder image cache if necessary. @@ -245,7 +245,7 @@ jobs: linux_amd64_package: executor: builder environment: - - PACKAGE_SPEC_ID: 1a93ce0fa57be896594a31ad452b1f492727c915 + - PACKAGE_SPEC_ID: c898543d0336265a97db0b12aaa6586c8fb9b591 steps: - setup_remote_docker: @@ -263,7 +263,7 @@ jobs: - write-package-cache-key - restore_cache: name: Restore package cache - key: 'cache006-package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}}' + key: 'cache006-package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}}' - run: name: Check the cache status. command: | @@ -279,8 +279,8 @@ jobs: - restore_cache: name: Restore build layer cache keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - run: @@ -311,7 +311,7 @@ jobs: command: ls -lahR .buildcache/packages - save_cache: name: Saving package cache - key: 'cache006-package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}}' + key: 'cache006-package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}}' paths: - .buildcache/packages/store # Save builder image cache if necessary. @@ -320,7 +320,7 @@ jobs: windows_amd64_package: executor: builder environment: - - PACKAGE_SPEC_ID: 7c03e0434a3d1cb97495af4e5db40c716584dd5e + - PACKAGE_SPEC_ID: adab0845b4818046d81b158942f2127b0b353975 steps: - setup_remote_docker: @@ -338,7 +338,7 @@ jobs: - write-package-cache-key - restore_cache: name: Restore package cache - key: 'cache006-package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}}' + key: 'cache006-package-adab0845b4818046d81b158942f2127b0b353975-{{checksum ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}}' - run: name: Check the cache status. command: | @@ -354,8 +354,8 @@ jobs: - restore_cache: name: Restore build layer cache keys: - - cache006-copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - cache006-go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - cache006-copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - cache006-go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - run: @@ -386,7 +386,7 @@ jobs: command: ls -lahR .buildcache/packages - save_cache: name: Saving package cache - key: 'cache006-package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}}' + key: 'cache006-package-adab0845b4818046d81b158942f2127b0b353975-{{checksum ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}}' paths: - .buildcache/packages/store # Save builder image cache if necessary. @@ -401,21 +401,21 @@ jobs: - load-darwin_amd64_package - run: environment: - PACKAGE_SPEC_ID: 0f13a5db9132c9350b00e8f221a982e8395b69b4 + PACKAGE_SPEC_ID: 8ec0a2c34a678cdd7266acb843d426fc3bbcba5a name: Write package metadata for darwin_amd64_package command: | make package-meta - load-linux_amd64_package - run: environment: - PACKAGE_SPEC_ID: 1a93ce0fa57be896594a31ad452b1f492727c915 + PACKAGE_SPEC_ID: c898543d0336265a97db0b12aaa6586c8fb9b591 name: Write package metadata for linux_amd64_package command: | make package-meta - load-windows_amd64_package - run: environment: - PACKAGE_SPEC_ID: 7c03e0434a3d1cb97495af4e5db40c716584dd5e + PACKAGE_SPEC_ID: adab0845b4818046d81b158942f2127b0b353975 name: Write package metadata for windows_amd64_package command: | make package-meta @@ -457,17 +457,17 @@ commands: load-darwin_amd64_package: steps: - restore_cache: - key: 'cache006-package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}}' + key: 'cache006-package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}}' load-linux_amd64_package: steps: - restore_cache: - key: 'cache006-package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}}' + key: 'cache006-package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}}' load-windows_amd64_package: steps: - restore_cache: - key: 'cache006-package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}}' + key: 'cache006-package-adab0845b4818046d81b158942f2127b0b353975-{{checksum ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}}' write-build-layer-cache-keys: diff --git a/packages-oss.lock/layers/layers.mk b/packages-oss.lock/layers/layers.mk index 04a9a9eac..a42aad9a6 100755 --- a/packages-oss.lock/layers/layers.mk +++ b/packages-oss.lock/layers/layers.mk @@ -20,20 +20,20 @@ LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_CACHE_KEY_FILE := .buildcac LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_ARCHIVE_FILE := .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz $(eval $(call LAYER,$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_ID),$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_TYPE),$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_BASE_LAYER),$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_SOURCE_INCLUDE),$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_SOURCE_EXCLUDE),$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_CACHE_KEY_FILE),$(LAYER_01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d_ARCHIVE_FILE))) -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_ID := 02-go-modules-4329169e81f027b85b81899e720217fef865e165 -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_TYPE := go-modules -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_BASE_LAYER := 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_SOURCE_INCLUDE := go.mod go.sum -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_SOURCE_EXCLUDE := -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165 -LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_ARCHIVE_FILE := .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz -$(eval $(call LAYER,$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_ID),$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_TYPE),$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_BASE_LAYER),$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_SOURCE_INCLUDE),$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_SOURCE_EXCLUDE),$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_CACHE_KEY_FILE),$(LAYER_02-go-modules-4329169e81f027b85b81899e720217fef865e165_ARCHIVE_FILE))) +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_ID := 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_TYPE := go-modules +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_BASE_LAYER := 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_SOURCE_EXCLUDE := +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0 +LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_ARCHIVE_FILE := .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz +$(eval $(call LAYER,$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_ID),$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_TYPE),$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_BASE_LAYER),$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_SOURCE_INCLUDE),$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_SOURCE_EXCLUDE),$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_CACHE_KEY_FILE),$(LAYER_02-go-modules-c04ae752a459d182fd438e201c65786255e283b0_ARCHIVE_FILE))) -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_ID := 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_TYPE := copy-source -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_BASE_LAYER := 02-go-modules-4329169e81f027b85b81899e720217fef865e165 -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_SOURCE_INCLUDE := *.go -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_SOURCE_EXCLUDE := -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 -LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_ARCHIVE_FILE := .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz -$(eval $(call LAYER,$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_ID),$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_TYPE),$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_BASE_LAYER),$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_SOURCE_INCLUDE),$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_SOURCE_EXCLUDE),$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_CACHE_KEY_FILE),$(LAYER_03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691_ARCHIVE_FILE))) +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_ID := 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_TYPE := copy-source +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_BASE_LAYER := 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_SOURCE_INCLUDE := *.go +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_SOURCE_EXCLUDE := +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce +LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_ARCHIVE_FILE := .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz +$(eval $(call LAYER,$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_ID),$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_TYPE),$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_BASE_LAYER),$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_SOURCE_INCLUDE),$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_SOURCE_EXCLUDE),$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_CACHE_KEY_FILE),$(LAYER_03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce_ARCHIVE_FILE))) diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 34fd2ebdc..9313937dc 100644 --- a/packages-oss.lock/pkgs.yml +++ b/packages-oss.lock/pkgs.yml @@ -1,11 +1,11 @@ # *** # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # *** -lockid: a2761b50710b0c29 +lockid: 4134249734abd55f packagespec-version: 0.1.5 cache-version: 8 packages: -- packagespecid: 0f13a5db9132c9350b00e8f221a982e8395b69b4 +- packagespecid: 8ec0a2c34a678cdd7266acb843d426fc3bbcba5a inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -19,31 +19,30 @@ packages: meta: BUILD_JOB_NAME: darwin_amd64_package BUNDLE_NAME: boundary_0.1.0-beta.3 - POST_PROCESSORS: apple-notarize av-scan builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 - archive: .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + name: 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce + archive: .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz - type: go-modules - name: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 - archive: .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + name: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 + archive: .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - type: ui name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz - type: base name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4 + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a POST_PROCESSORS: apple-notarize av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - PACKAGE_CACHE_KEY: package-0f13a5db9132c9350b00e8f221a982e8395b69b4-{{checksum - ".buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4"}} + PACKAGE_CACHE_KEY: package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a-{{checksum + ".buildcache/cache-keys/package-8ec0a2c34a678cdd7266acb843d426fc3bbcba5a"}} build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; go build -v -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.3" @@ -54,7 +53,7 @@ packages: path: boundary_0.1.0-beta.3_darwin_amd64.zip - type: github-releases path: boundary_0.1.0-beta.3_darwin_amd64.zip -- packagespecid: 1a93ce0fa57be896594a31ad452b1f492727c915 +- packagespecid: c898543d0336265a97db0b12aaa6586c8fb9b591 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -68,31 +67,30 @@ packages: meta: BUILD_JOB_NAME: linux_amd64_package BUNDLE_NAME: boundary_0.1.0-beta.3 - POST_PROCESSORS: av-scan builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 - archive: .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + name: 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce + archive: .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz - type: go-modules - name: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 - archive: .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + name: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 + archive: .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - type: ui name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz - type: base name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915 + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - PACKAGE_CACHE_KEY: package-1a93ce0fa57be896594a31ad452b1f492727c915-{{checksum - ".buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915"}} + PACKAGE_CACHE_KEY: package-c898543d0336265a97db0b12aaa6586c8fb9b591-{{checksum + ".buildcache/cache-keys/package-c898543d0336265a97db0b12aaa6586c8fb9b591"}} build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; go build -v -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.3" @@ -103,7 +101,7 @@ packages: path: boundary_0.1.0-beta.3_linux_amd64.zip - type: github-releases path: boundary_0.1.0-beta.3_linux_amd64.zip -- packagespecid: 7c03e0434a3d1cb97495af4e5db40c716584dd5e +- packagespecid: adab0845b4818046d81b158942f2127b0b353975 inputs: BINARY_NAME: boundary.exe BUILD_TAGS: ui @@ -117,31 +115,30 @@ packages: meta: BUILD_JOB_NAME: windows_amd64_package BUNDLE_NAME: boundary_0.1.0-beta.3 - POST_PROCESSORS: microsoft-notarize av-scan builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 - archive: .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + name: 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce + archive: .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz - type: go-modules - name: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 - archive: .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + name: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 + archive: .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - type: ui name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz - type: base name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975 POST_PROCESSORS: microsoft-notarize av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - PACKAGE_CACHE_KEY: package-7c03e0434a3d1cb97495af4e5db40c716584dd5e-{{checksum - ".buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e"}} + PACKAGE_CACHE_KEY: package-adab0845b4818046d81b158942f2127b0b353975-{{checksum + ".buildcache/cache-keys/package-adab0845b4818046d81b158942f2127b0b353975"}} build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; go build -v -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.3" @@ -250,15 +247,15 @@ layers: - depth: 2 final: false type: go-modules - id: 4329169e81f027b85b81899e720217fef865e165 - name: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 + id: c04ae752a459d182fd438e201c65786255e283b0 + name: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 parentname: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d parenttype: ui parentid: 5f82d1f0cbf979ee051aa1ba0f7105483fa6947d - cachekeyfile: .buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165 - sourceinclude: go.mod go.sum + cachekeyfile: .buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0 + sourceinclude: go.mod go.sum */go.mod */go.sum sourceexclude: "" - archivefile: .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + archivefile: .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz dockerfile: | # syntax=docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE @@ -269,8 +266,8 @@ layers: builtin: LAYER_LIST: - type: go-modules - name: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 - archive: .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + name: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 + archive: .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - type: ui name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz @@ -279,22 +276,22 @@ layers: archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz circleci: CACHE_KEY_PREFIX_LIST: - - go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} childcount: 1 - depth: 3 final: true type: copy-source - id: 33b2efc628fbbe13613a0fb6a2770ed00b4f5691 - name: 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 - parentname: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 + id: fce5e0d3b7a9f6a01ce1edd2326dce43779903ce + name: 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce + parentname: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 parenttype: go-modules - parentid: 4329169e81f027b85b81899e720217fef865e165 - cachekeyfile: .buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 + parentid: c04ae752a459d182fd438e201c65786255e283b0 + cachekeyfile: .buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce sourceinclude: '*.go' sourceexclude: "" - archivefile: .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + archivefile: .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz dockerfile: | # syntax=docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE @@ -305,11 +302,11 @@ layers: builtin: LAYER_LIST: - type: copy-source - name: 03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691 - archive: .buildcache/archives/03-copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691.tar.gz + name: 03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce + archive: .buildcache/archives/03-copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce.tar.gz - type: go-modules - name: 02-go-modules-4329169e81f027b85b81899e720217fef865e165 - archive: .buildcache/archives/02-go-modules-4329169e81f027b85b81899e720217fef865e165.tar.gz + name: 02-go-modules-c04ae752a459d182fd438e201c65786255e283b0 + archive: .buildcache/archives/02-go-modules-c04ae752a459d182fd438e201c65786255e283b0.tar.gz - type: ui name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz @@ -318,8 +315,8 @@ layers: archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz circleci: CACHE_KEY_PREFIX_LIST: - - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}} - - go-modules_4329_{{checksum ".buildcache/cache-keys/go-modules-4329169e81f027b85b81899e720217fef865e165"}} + - copy-source_fce5_{{checksum ".buildcache/cache-keys/copy-source-fce5e0d3b7a9f6a01ce1edd2326dce43779903ce"}} + - go-modules_c04a_{{checksum ".buildcache/cache-keys/go-modules-c04ae752a459d182fd438e201c65786255e283b0"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} childcount: 0 diff --git a/packages-oss.yml b/packages-oss.yml index bb8ec3af2..1daf43b6c 100644 --- a/packages-oss.yml +++ b/packages-oss.yml @@ -34,10 +34,6 @@ meta: templates: BUILD_JOB_NAME: >- {{.GOOS}}_{{.GOARCH}}_package - POST_PROCESSORS: ' - {{- if and (eq .GOOS "darwin") (eq .GOARCH "amd64")}}apple-notarize {{end -}} - {{- if and (eq .GOOS "windows") (eq .GOARCH "amd64")}}microsoft-notarize {{end -}} - av-scan' BUNDLE_NAME: "boundary_{{.PRODUCT_VERSION}}" package-aliases: @@ -78,6 +74,7 @@ layers: && git config --global url."git@github.com:".insteadOf https://github.com/ \ && go get github.com/go-bindata/go-bindata/v3/go-bindata \ && go-bindata --version + - name: ui source-include: internal/ui/VERSION dockerfile: | @@ -96,10 +93,12 @@ layers: && go-bindata -fs -o "$TARGET" -pkg ui \ -prefix "$UIDIR" "$UIDIR" "$UIDIR/assets" \ && rm -rf "$DIR" + - name: go-modules - source-include: go.mod go.sum + source-include: "go.mod go.sum */go.mod */go.sum" dockerfile: | RUN --mount=type=ssh go mod download + - name: copy-source source-include: "*.go" dockerfile: |