From a90a64d7873077a2ed9a3b6ed84fb3202651916b Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 20 Apr 2021 09:45:05 -0500 Subject: [PATCH] Use Go 1.16 native embedding and remove go-bindata (#1151) Co-authored-by: Sam Salisbury --- .circleci/config.yml | 278 +++++------ .circleci/config/@build-release.yml | 278 +++++------ .gitignore | 1 - Makefile | 2 +- ci/goinstall.sh | 2 +- depowners.md | 3 - go.mod | 1 - go.sum | 7 - internal/servers/controller/handler_ui.go | 2 +- internal/ui/assets.go | 33 ++ packages-oss.lock/layers/layers.mk | 64 +-- packages-oss.lock/pkgs.yml | 573 +++++++++++----------- packages-oss.yml | 17 +- scripts/uigen.sh | 8 - tools/tools.go | 3 - 15 files changed, 634 insertions(+), 638 deletions(-) create mode 100644 internal/ui/assets.go diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ca888277..56ec5b7f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,49 +19,49 @@ jobs: command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore name: Ignore .buildcache - restore_cache: - key: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + key: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} name: Restore package cache - restore_cache: - key: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + key: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} name: Restore package cache - restore_cache: - key: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + key: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} name: Restore package cache - restore_cache: - key: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + key: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} name: Restore package cache - restore_cache: - key: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + key: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} name: Restore package cache - restore_cache: - key: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + key: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} name: Restore package cache - restore_cache: - key: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + key: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} name: Restore package cache - restore_cache: - key: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + key: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} name: Restore package cache - restore_cache: - key: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + key: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} name: Restore package cache - restore_cache: - key: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + key: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} name: Restore package cache - restore_cache: - key: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + key: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} name: Restore package cache - restore_cache: - key: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + key: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} name: Restore package cache - restore_cache: - key: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + key: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} name: Restore package cache - restore_cache: - key: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + key: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} name: Restore package cache - restore_cache: - key: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + key: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} name: Restore package cache - run: command: make package-meta-all @@ -73,20 +73,20 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-46c0c7714dcaa1d0.yml + command: cp packages*.lock/pkgs.yml lockfile-6cd3353dfe5a6bf9.yml name: Update Lockfile Name - run: - command: tar -czf packages-46c0c7714dcaa1d0.tar.gz .buildcache/packages lockfile-46c0c7714dcaa1d0.yml + command: tar -czf packages-6cd3353dfe5a6bf9.tar.gz .buildcache/packages lockfile-6cd3353dfe5a6bf9.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-46c0c7714dcaa1d0.tar.gz .buildcache/packages/store/*.json lockfile-46c0c7714dcaa1d0.yml + command: tar -czf meta-6cd3353dfe5a6bf9.tar.gz .buildcache/packages/store/*.json lockfile-6cd3353dfe5a6bf9.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-46c0c7714dcaa1d0.yml + path: lockfile-6cd3353dfe5a6bf9.yml - store_artifacts: - path: packages-46c0c7714dcaa1d0.tar.gz + path: packages-6cd3353dfe5a6bf9.tar.gz - store_artifacts: - path: meta-46c0c7714dcaa1d0.tar.gz + path: meta-6cd3353dfe5a6bf9.tar.gz - store_artifacts: path: .buildcache/packages environment: @@ -101,7 +101,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 01433dc5a2317cbdfccff5f5a70a802585c09d99 + - PACKAGE_SPEC_ID: b44cab2d26b1c045151c8748f823036c2f2f064f steps: - setup_remote_docker: docker_layer_caching: false @@ -115,7 +115,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + key: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} name: Restore package cache - run: command: |2 @@ -131,11 +131,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -161,7 +161,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + key: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} name: Save package cache paths: - .buildcache/packages/store @@ -173,7 +173,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 184227cfb70db0b424c6ed94229d21546f94e59d + - PACKAGE_SPEC_ID: 89eb36dd3e2bdfb20509565f1f7bf7d206fd5554 steps: - setup_remote_docker: docker_layer_caching: false @@ -187,7 +187,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + key: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} name: Restore package cache - run: command: |2 @@ -203,11 +203,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -233,7 +233,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + key: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} name: Save package cache paths: - .buildcache/packages/store @@ -252,14 +252,14 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Layer Cache: copy-source' - run: - command: LAYER_SPEC_ID=03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 make -C packages*.lock load-builder-cache + command: LAYER_SPEC_ID=03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 make -C packages*.lock load-builder-cache name: Load whatever builder cache we have (if any) into the Docker daemon - run: command: |2- @@ -275,7 +275,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 00-base-ee8404894ff76e881ab504662f5939942211534b-image + make -f packages*.lock/layer.mk 00-base-acb5298039d979012605aa8af44f1cb03bc34809-image name: Build base layer - run: command: |2- @@ -291,7 +291,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 01-ui-4fd955a556287609732f32e61ba9b2718113af93-image + make -f packages*.lock/layer.mk 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d-image name: Build ui layer - run: command: |2- @@ -307,7 +307,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3-image + make -f packages*.lock/layer.mk 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd-image name: Build go-modules layer - run: command: |2- @@ -323,7 +323,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49-image + make -f packages*.lock/layer.mk 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63-image name: Build copy-source layer - run: command: |2- @@ -339,13 +339,13 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49-save + make -f packages*.lock/layer.mk 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63-save name: Build copy-source layer - save_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} name: 'Save Layer Cache: copy-source' paths: - - .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + - .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz environment: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain @@ -358,7 +358,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 7c4c77fabb7438b01bd4da25bc8712068ffe0e1a + - PACKAGE_SPEC_ID: 2cee420d0a27d5e69ddc4618521a5dc74c0b7481 steps: - setup_remote_docker: docker_layer_caching: false @@ -372,7 +372,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + key: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} name: Restore package cache - run: command: |2 @@ -388,11 +388,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -418,7 +418,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + key: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} name: Save package cache paths: - .buildcache/packages/store @@ -430,7 +430,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 7e9c0c8225db5f23ed0f4e34c30b1267a86956c8 + - PACKAGE_SPEC_ID: 372a1da4d10d0a167beea7aa4a21009db23cb2f9 steps: - setup_remote_docker: docker_layer_caching: false @@ -444,7 +444,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + key: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} name: Restore package cache - run: command: |2 @@ -460,11 +460,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -490,7 +490,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + key: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} name: Save package cache paths: - .buildcache/packages/store @@ -513,7 +513,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: a25dfd64da01479f42cb88cc13fec056c685cfce + - PACKAGE_SPEC_ID: 1dfbef246de63b29459505ccae17adbe07b5f430 steps: - setup_remote_docker: docker_layer_caching: false @@ -527,7 +527,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + key: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} name: Restore package cache - run: command: |2 @@ -543,11 +543,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -573,7 +573,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + key: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} name: Save package cache paths: - .buildcache/packages/store @@ -585,7 +585,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 55764fcd4564716267ccfec3f3bbe2d5e7c1394a + - PACKAGE_SPEC_ID: 524dbd03848c946e20de0aac8d5254908bca362d steps: - setup_remote_docker: docker_layer_caching: false @@ -599,7 +599,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + key: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} name: Restore package cache - run: command: |2 @@ -615,11 +615,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -645,7 +645,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + key: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} name: Save package cache paths: - .buildcache/packages/store @@ -657,7 +657,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 0b738a815a88ac698cdac9320f60b8845476ccf1 + - PACKAGE_SPEC_ID: 678afe01c4b1e5bc200431da47b55c4a077c2d56 steps: - setup_remote_docker: docker_layer_caching: false @@ -671,7 +671,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + key: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} name: Restore package cache - run: command: |2 @@ -687,11 +687,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -717,7 +717,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + key: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} name: Save package cache paths: - .buildcache/packages/store @@ -729,7 +729,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: a2bfe5eec302a06a0e42f1664a43866fc9325495 + - PACKAGE_SPEC_ID: 0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc steps: - setup_remote_docker: docker_layer_caching: false @@ -743,7 +743,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + key: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} name: Restore package cache - run: command: |2 @@ -759,11 +759,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -789,7 +789,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + key: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} name: Save package cache paths: - .buildcache/packages/store @@ -801,7 +801,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: a87eb17f530931a4e0f823371d8378cd8c5f9e7a + - PACKAGE_SPEC_ID: 8e95d6a584eb3d67acc1229d751e5d138221ec3e steps: - setup_remote_docker: docker_layer_caching: false @@ -815,7 +815,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + key: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} name: Restore package cache - run: command: |2 @@ -831,11 +831,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -861,7 +861,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + key: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} name: Save package cache paths: - .buildcache/packages/store @@ -873,7 +873,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: a32051cd510b4cba9457ce1d3349f12ffd73b6c6 + - PACKAGE_SPEC_ID: b0676047f322eb760146c868d9014f1baa969104 steps: - setup_remote_docker: docker_layer_caching: false @@ -887,7 +887,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + key: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} name: Restore package cache - run: command: |2 @@ -903,11 +903,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -933,7 +933,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + key: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} name: Save package cache paths: - .buildcache/packages/store @@ -1085,7 +1085,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 0fdd9e880642ccba5cf231cc680b66b52a89cb01 + - PACKAGE_SPEC_ID: 766ea58fe7a1bade33b6fe51ca82195dee5e0a32 steps: - setup_remote_docker: docker_layer_caching: false @@ -1099,7 +1099,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + key: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} name: Restore package cache - run: command: |2 @@ -1115,11 +1115,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1145,7 +1145,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + key: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} name: Save package cache paths: - .buildcache/packages/store @@ -1157,7 +1157,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: b5e41e598aedaa5f8ca29187ae0df28d92c076d5 + - PACKAGE_SPEC_ID: e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee steps: - setup_remote_docker: docker_layer_caching: false @@ -1171,7 +1171,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + key: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} name: Restore package cache - run: command: |2 @@ -1187,11 +1187,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1217,7 +1217,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + key: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} name: Save package cache paths: - .buildcache/packages/store @@ -1229,7 +1229,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: d2ccbfae1e7e530b048a21d5a8d175334405d5e1 + - PACKAGE_SPEC_ID: 66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9 steps: - setup_remote_docker: docker_layer_caching: false @@ -1243,7 +1243,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + key: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} name: Restore package cache - run: command: |2 @@ -1259,11 +1259,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1289,7 +1289,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + key: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} name: Save package cache paths: - .buildcache/packages/store @@ -1301,7 +1301,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 787e1b5aa3421c688a8af29743f73146cb58bb3b + - PACKAGE_SPEC_ID: 2142f71e9cd5098224a7d0bfb22042569a0523db steps: - setup_remote_docker: docker_layer_caching: false @@ -1315,7 +1315,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + key: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} name: Restore package cache - run: command: |2 @@ -1331,11 +1331,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1361,7 +1361,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + key: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} name: Save package cache paths: - .buildcache/packages/store @@ -1373,7 +1373,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: c092c3cb3b0586a50816d6629890cf4a2542cec9 + - PACKAGE_SPEC_ID: 43b9906bfdd0aecb91a30b465e92f7502ee9e9c4 steps: - setup_remote_docker: docker_layer_caching: false @@ -1387,7 +1387,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + key: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} name: Restore package cache - run: command: |2 @@ -1403,11 +1403,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1433,12 +1433,12 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + key: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} name: Save package cache paths: - .buildcache/packages/store workflows: - build-46c0c7714dcaa1d0: + build-6cd3353dfe5a6bf9: jobs: - build-common-layers - darwin_amd64_package: diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index ef889c94d..4170e68cc 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -30,14 +30,14 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Layer Cache: copy-source' - run: - command: LAYER_SPEC_ID=03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 make -C packages*.lock load-builder-cache + command: LAYER_SPEC_ID=03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 make -C packages*.lock load-builder-cache name: Load whatever builder cache we have (if any) into the Docker daemon - run: command: |2- @@ -53,7 +53,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 00-base-ee8404894ff76e881ab504662f5939942211534b-image + make -f packages*.lock/layer.mk 00-base-acb5298039d979012605aa8af44f1cb03bc34809-image name: Build base layer - run: command: |2- @@ -69,7 +69,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 01-ui-4fd955a556287609732f32e61ba9b2718113af93-image + make -f packages*.lock/layer.mk 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d-image name: Build ui layer - run: command: |2- @@ -85,7 +85,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3-image + make -f packages*.lock/layer.mk 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd-image name: Build go-modules layer - run: command: |2- @@ -101,7 +101,7 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49-image + make -f packages*.lock/layer.mk 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63-image name: Build copy-source layer - run: command: |2- @@ -117,12 +117,12 @@ jobs: echo " attempts to directly clone private repositories." fi - make -f packages*.lock/layer.mk 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49-save + make -f packages*.lock/layer.mk 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63-save name: Build copy-source layer - save_cache: paths: - - .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + - .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} name: 'Save Layer Cache: copy-source' bundle-releases: executor: builder @@ -136,49 +136,49 @@ jobs: command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore name: Ignore .buildcache - restore_cache: - key: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + key: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} name: Restore package cache - restore_cache: - key: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + key: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} name: Restore package cache - restore_cache: - key: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + key: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} name: Restore package cache - restore_cache: - key: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + key: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} name: Restore package cache - restore_cache: - key: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + key: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} name: Restore package cache - restore_cache: - key: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + key: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} name: Restore package cache - restore_cache: - key: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + key: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} name: Restore package cache - restore_cache: - key: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + key: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} name: Restore package cache - restore_cache: - key: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + key: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} name: Restore package cache - restore_cache: - key: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + key: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} name: Restore package cache - restore_cache: - key: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + key: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} name: Restore package cache - restore_cache: - key: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + key: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} name: Restore package cache - restore_cache: - key: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + key: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} name: Restore package cache - restore_cache: - key: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + key: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} name: Restore package cache - restore_cache: - key: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + key: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} name: Restore package cache - run: command: make package-meta-all @@ -190,20 +190,20 @@ jobs: command: ls -lahR .buildcache name: List Build Cache - run: - command: cp packages*.lock/pkgs.yml lockfile-46c0c7714dcaa1d0.yml + command: cp packages*.lock/pkgs.yml lockfile-6cd3353dfe5a6bf9.yml name: Update Lockfile Name - run: - command: tar -czf packages-46c0c7714dcaa1d0.tar.gz .buildcache/packages lockfile-46c0c7714dcaa1d0.yml + command: tar -czf packages-6cd3353dfe5a6bf9.tar.gz .buildcache/packages lockfile-6cd3353dfe5a6bf9.yml name: Create Raw Package Tarball - run: - command: tar -czf meta-46c0c7714dcaa1d0.tar.gz .buildcache/packages/store/*.json lockfile-46c0c7714dcaa1d0.yml + command: tar -czf meta-6cd3353dfe5a6bf9.tar.gz .buildcache/packages/store/*.json lockfile-6cd3353dfe5a6bf9.yml name: Create Metadata Tarball - store_artifacts: - path: lockfile-46c0c7714dcaa1d0.yml + path: lockfile-6cd3353dfe5a6bf9.yml - store_artifacts: - path: packages-46c0c7714dcaa1d0.tar.gz + path: packages-6cd3353dfe5a6bf9.tar.gz - store_artifacts: - path: meta-46c0c7714dcaa1d0.tar.gz + path: meta-6cd3353dfe5a6bf9.tar.gz - store_artifacts: path: .buildcache/packages darwin_amd64_package: @@ -221,7 +221,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + key: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} name: Restore package cache - run: command: |2 @@ -237,11 +237,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -269,10 +269,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + key: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 01433dc5a2317cbdfccff5f5a70a802585c09d99 + PACKAGE_SPEC_ID: b44cab2d26b1c045151c8748f823036c2f2f064f freebsd_386_package: executor: builder steps: @@ -288,7 +288,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + key: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} name: Restore package cache - run: command: |2 @@ -304,11 +304,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -336,10 +336,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + key: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 55764fcd4564716267ccfec3f3bbe2d5e7c1394a + PACKAGE_SPEC_ID: 524dbd03848c946e20de0aac8d5254908bca362d freebsd_amd64_package: executor: builder steps: @@ -355,7 +355,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + key: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} name: Restore package cache - run: command: |2 @@ -371,11 +371,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -403,10 +403,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + key: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 0b738a815a88ac698cdac9320f60b8845476ccf1 + PACKAGE_SPEC_ID: 678afe01c4b1e5bc200431da47b55c4a077c2d56 freebsd_arm_package: executor: builder steps: @@ -422,7 +422,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + key: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} name: Restore package cache - run: command: |2 @@ -438,11 +438,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -470,10 +470,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + key: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 787e1b5aa3421c688a8af29743f73146cb58bb3b + PACKAGE_SPEC_ID: 2142f71e9cd5098224a7d0bfb22042569a0523db linux_386_package: executor: builder steps: @@ -489,7 +489,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + key: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} name: Restore package cache - run: command: |2 @@ -505,11 +505,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -537,10 +537,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + key: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} name: Save package cache environment: - PACKAGE_SPEC_ID: a25dfd64da01479f42cb88cc13fec056c685cfce + PACKAGE_SPEC_ID: 1dfbef246de63b29459505ccae17adbe07b5f430 linux_amd64_package: executor: builder steps: @@ -556,7 +556,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + key: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} name: Restore package cache - run: command: |2 @@ -572,11 +572,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -604,10 +604,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + key: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} name: Save package cache environment: - PACKAGE_SPEC_ID: a87eb17f530931a4e0f823371d8378cd8c5f9e7a + PACKAGE_SPEC_ID: 8e95d6a584eb3d67acc1229d751e5d138221ec3e linux_arm_package: executor: builder steps: @@ -623,7 +623,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + key: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} name: Restore package cache - run: command: |2 @@ -639,11 +639,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -671,10 +671,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + key: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 7e9c0c8225db5f23ed0f4e34c30b1267a86956c8 + PACKAGE_SPEC_ID: 372a1da4d10d0a167beea7aa4a21009db23cb2f9 linux_arm64_package: executor: builder steps: @@ -690,7 +690,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + key: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} name: Restore package cache - run: command: |2 @@ -706,11 +706,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -738,10 +738,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + key: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 7c4c77fabb7438b01bd4da25bc8712068ffe0e1a + PACKAGE_SPEC_ID: 2cee420d0a27d5e69ddc4618521a5dc74c0b7481 netbsd_386_package: executor: builder steps: @@ -757,7 +757,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + key: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} name: Restore package cache - run: command: |2 @@ -773,11 +773,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -805,10 +805,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + key: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} name: Save package cache environment: - PACKAGE_SPEC_ID: d2ccbfae1e7e530b048a21d5a8d175334405d5e1 + PACKAGE_SPEC_ID: 66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9 netbsd_amd64_package: executor: builder steps: @@ -824,7 +824,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + key: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} name: Restore package cache - run: command: |2 @@ -840,11 +840,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -872,10 +872,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + key: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 0fdd9e880642ccba5cf231cc680b66b52a89cb01 + PACKAGE_SPEC_ID: 766ea58fe7a1bade33b6fe51ca82195dee5e0a32 openbsd_386_package: executor: builder steps: @@ -891,7 +891,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + key: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} name: Restore package cache - run: command: |2 @@ -907,11 +907,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -939,10 +939,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + key: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} name: Save package cache environment: - PACKAGE_SPEC_ID: a2bfe5eec302a06a0e42f1664a43866fc9325495 + PACKAGE_SPEC_ID: 0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc openbsd_amd64_package: executor: builder steps: @@ -958,7 +958,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + key: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} name: Restore package cache - run: command: |2 @@ -974,11 +974,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1006,10 +1006,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + key: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} name: Save package cache environment: - PACKAGE_SPEC_ID: b5e41e598aedaa5f8ca29187ae0df28d92c076d5 + PACKAGE_SPEC_ID: e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee solaris_amd64_package: executor: builder steps: @@ -1025,7 +1025,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + key: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} name: Restore package cache - run: command: |2 @@ -1041,11 +1041,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1073,10 +1073,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + key: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} name: Save package cache environment: - PACKAGE_SPEC_ID: a32051cd510b4cba9457ce1d3349f12ffd73b6c6 + PACKAGE_SPEC_ID: b0676047f322eb760146c868d9014f1baa969104 windows_386_package: executor: builder steps: @@ -1092,7 +1092,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + key: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} name: Restore package cache - run: command: |2 @@ -1108,11 +1108,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1140,10 +1140,10 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + key: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} name: Save package cache environment: - PACKAGE_SPEC_ID: 184227cfb70db0b424c6ed94229d21546f94e59d + PACKAGE_SPEC_ID: 89eb36dd3e2bdfb20509565f1f7bf7d206fd5554 windows_amd64_package: executor: builder steps: @@ -1159,7 +1159,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + key: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} name: Restore package cache - run: command: |2 @@ -1175,11 +1175,11 @@ jobs: command: make -C packages*.lock write-builder-cache-keys name: Write builder layer cache keys - restore_cache: - key: copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} + key: copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} keys: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} name: 'Restore Builder Image Cache: copy-source' - run: command: make -C packages*.lock load-builder-cache @@ -1207,12 +1207,12 @@ jobs: - save_cache: paths: - .buildcache/packages/store - key: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + key: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} name: Save package cache environment: - PACKAGE_SPEC_ID: c092c3cb3b0586a50816d6629890cf4a2542cec9 + PACKAGE_SPEC_ID: 43b9906bfdd0aecb91a30b465e92f7502ee9e9c4 workflows: - build-46c0c7714dcaa1d0: + build-6cd3353dfe5a6bf9: jobs: - build-common-layers: {} - darwin_amd64_package: diff --git a/.gitignore b/.gitignore index 698cf0b4b..870c33cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -118,7 +118,6 @@ Sessionx.vim main /pkg/ /bin/ -internal/ui/assets.go update-ui-assets* # Test config file diff --git a/Makefile b/Makefile index 47abff053..9363cfba3 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ build-ui: ./scripts/uiclone.sh && ./scripts/uigen.sh build-ui-ifne: -ifeq (,$(wildcard internal/ui/assets.go)) +ifeq (,$(wildcard internal/ui/.tmp/boundary-ui)) @echo "==> No UI assets found, building..." @$(MAKE) build-ui else diff --git a/ci/goinstall.sh b/ci/goinstall.sh index 8b57a73a0..559233ee4 100755 --- a/ci/goinstall.sh +++ b/ci/goinstall.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -VERSION="1.15.11" +VERSION="1.16.3" [ -z "$GOROOT" ] && GOROOT="$HOME/.go" [ -z "$GOPATH" ] && GOPATH="$HOME/go" diff --git a/depowners.md b/depowners.md index 27f42b6a1..de75af9e1 100644 --- a/depowners.md +++ b/depowners.md @@ -40,9 +40,6 @@ the first place. * github.com/favadi/protoc-go-inject-tag * Jim * Todd -* github.com/go-bindata/go-bindata/v3 - * Jeff - * Jim * github.com/golang-migrate/migrate/v4 * Jim * Mike diff --git a/go.mod b/go.mod index 10b18e73f..6431291ac 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ require ( github.com/dhui/dktest v0.3.4 github.com/fatih/color v1.10.0 github.com/favadi/protoc-go-inject-tag v1.1.0 - github.com/go-bindata/go-bindata/v3 v3.1.3 github.com/golang-migrate/migrate/v4 v4.14.1 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe github.com/golang/protobuf v1.5.2 diff --git a/go.sum b/go.sum index 84c17fe63..7ddf6854d 100644 --- a/go.sum +++ b/go.sum @@ -284,8 +284,6 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= -github.com/go-bindata/go-bindata/v3 v3.1.3 h1:F0nVttLC3ws0ojc7p60veTurcOm//D4QBODNM7EGrCI= -github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -438,10 +436,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0 h1:IvO4FbbQL6n3v3M1rQNobZ61SGL0gJLdvKA5KETM7Xs= github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0/go.mod h1:d2gYTOTUQklu06xp0AJYYmRdTVU1VKrqhkYfYag2L08= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hashicorp/boundary/api v0.0.9 h1:6+m/Rxtwjv+JaSi+uVZcBlUuWWR16GclW3npp/uuVcM= -github.com/hashicorp/boundary/api v0.0.9/go.mod h1:+XltL0g2eo4C4BiFep/7w1wR6XDYqBBUoYMHDeVbijA= -github.com/hashicorp/boundary/sdk v0.0.4 h1:l3uuXOL5ZQwYc63Bm8sLY36XGUlIN/4Q2r2SqkmGTyw= -github.com/hashicorp/boundary/sdk v0.0.4/go.mod h1:MQ8FJhseJrKpwvFDTn+AUAcJ1vdk1NKUxk7DxQgH7oQ= github.com/hashicorp/cap v0.0.0-20210408110729-0dd65efe5473 h1:qEikB8/ychrgsll9feuGjVLt0qo5oktfyTWi7BLsUrg= github.com/hashicorp/cap v0.0.0-20210408110729-0dd65efe5473/go.mod h1:hjMYKmFvk9AOL69NbqrahCHoMPZHRWqvRcdr7ciPU7g= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= @@ -623,7 +617,6 @@ github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0 github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= -github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= diff --git a/internal/servers/controller/handler_ui.go b/internal/servers/controller/handler_ui.go index b28d47c01..f766606b2 100644 --- a/internal/servers/controller/handler_ui.go +++ b/internal/servers/controller/handler_ui.go @@ -18,7 +18,7 @@ func handleUiWithAssets(c *Controller) http.Handler { if c.conf.RawConfig.PassthroughDirectory != "" { nextHandler = devPassthroughHandler(c.logger, c.conf.RawConfig.PassthroughDirectory) } else { - nextHandler = http.FileServer(ui.AssetFile()) + nextHandler = ui.Handler() } return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/internal/ui/assets.go b/internal/ui/assets.go new file mode 100644 index 000000000..e2beca9db --- /dev/null +++ b/internal/ui/assets.go @@ -0,0 +1,33 @@ +// +build ui + +package ui + +import ( + "embed" + "io/fs" + "net/http" +) + +// Sadly we can't embed this into the embed line, but we use it elsewhere +const contentDir = ".tmp/boundary-ui/ui/admin/dist" + +// content is our static web server content. +//go:embed .tmp/boundary-ui/ui/admin/dist +var content embed.FS + +func Handler() http.Handler { + return http.FileServer(httpFileSystem()) +} + +func httpFileSystem() http.FileSystem { + return http.FS(fileSystem()) +} + +func fileSystem() fs.FS { + // Remove the root + f, err := fs.Sub(content, contentDir) + if err != nil { + panic(err) + } + return f +} diff --git a/packages-oss.lock/layers/layers.mk b/packages-oss.lock/layers/layers.mk index 69a3d5055..bb2a95ad2 100755 --- a/packages-oss.lock/layers/layers.mk +++ b/packages-oss.lock/layers/layers.mk @@ -2,38 +2,38 @@ # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # *** -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_ID := 00-base-ee8404894ff76e881ab504662f5939942211534b -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_TYPE := base -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_BASE_LAYER := -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_SOURCE_INCLUDE := -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_SOURCE_EXCLUDE := -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_CACHE_KEY_FILE := .buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b -LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_ARCHIVE_FILE := .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz -$(eval $(call LAYER,$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_ID),$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_TYPE),$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_BASE_LAYER),$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_SOURCE_INCLUDE),$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_SOURCE_EXCLUDE),$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_CACHE_KEY_FILE),$(LAYER_00-base-ee8404894ff76e881ab504662f5939942211534b_ARCHIVE_FILE))) +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_ID := 00-base-acb5298039d979012605aa8af44f1cb03bc34809 +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_TYPE := base +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_BASE_LAYER := +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_SOURCE_INCLUDE := +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_SOURCE_EXCLUDE := +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_CACHE_KEY_FILE := .buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809 +LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_ARCHIVE_FILE := .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz +$(eval $(call LAYER,$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_ID),$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_TYPE),$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_BASE_LAYER),$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_SOURCE_INCLUDE),$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_SOURCE_EXCLUDE),$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_CACHE_KEY_FILE),$(LAYER_00-base-acb5298039d979012605aa8af44f1cb03bc34809_ARCHIVE_FILE))) -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_ID := 01-ui-4fd955a556287609732f32e61ba9b2718113af93 -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_TYPE := ui -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_BASE_LAYER := 00-base-ee8404894ff76e881ab504662f5939942211534b -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_SOURCE_INCLUDE := internal/ui/VERSION -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_SOURCE_EXCLUDE := -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_CACHE_KEY_FILE := .buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93 -LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_ARCHIVE_FILE := .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz -$(eval $(call LAYER,$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_ID),$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_TYPE),$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_BASE_LAYER),$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_SOURCE_INCLUDE),$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_SOURCE_EXCLUDE),$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_CACHE_KEY_FILE),$(LAYER_01-ui-4fd955a556287609732f32e61ba9b2718113af93_ARCHIVE_FILE))) +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_ID := 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_TYPE := ui +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_BASE_LAYER := 00-base-acb5298039d979012605aa8af44f1cb03bc34809 +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_SOURCE_INCLUDE := internal/ui/VERSION +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_SOURCE_EXCLUDE := +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_CACHE_KEY_FILE := .buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d +LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_ARCHIVE_FILE := .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz +$(eval $(call LAYER,$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_ID),$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_TYPE),$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_BASE_LAYER),$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_SOURCE_INCLUDE),$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_SOURCE_EXCLUDE),$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_CACHE_KEY_FILE),$(LAYER_01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d_ARCHIVE_FILE))) -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_ID := 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_TYPE := go-modules -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_BASE_LAYER := 01-ui-4fd955a556287609732f32e61ba9b2718113af93 -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_SOURCE_EXCLUDE := -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 -LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_ARCHIVE_FILE := .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz -$(eval $(call LAYER,$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_ID),$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_TYPE),$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_BASE_LAYER),$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_SOURCE_INCLUDE),$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_SOURCE_EXCLUDE),$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_CACHE_KEY_FILE),$(LAYER_02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3_ARCHIVE_FILE))) +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_ID := 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_TYPE := go-modules +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_BASE_LAYER := 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_SOURCE_EXCLUDE := +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd +LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_ARCHIVE_FILE := .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz +$(eval $(call LAYER,$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_ID),$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_TYPE),$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_BASE_LAYER),$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_SOURCE_INCLUDE),$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_SOURCE_EXCLUDE),$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_CACHE_KEY_FILE),$(LAYER_02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd_ARCHIVE_FILE))) -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_ID := 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_TYPE := copy-source -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_BASE_LAYER := 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_SOURCE_INCLUDE := *.go -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_SOURCE_EXCLUDE := -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49 -LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_ARCHIVE_FILE := .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz -$(eval $(call LAYER,$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_ID),$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_TYPE),$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_BASE_LAYER),$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_SOURCE_INCLUDE),$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_SOURCE_EXCLUDE),$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_CACHE_KEY_FILE),$(LAYER_03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49_ARCHIVE_FILE))) +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_ID := 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_TYPE := copy-source +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_BASE_LAYER := 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_SOURCE_INCLUDE := *.go +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_SOURCE_EXCLUDE := +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 +LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_ARCHIVE_FILE := .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz +$(eval $(call LAYER,$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_ID),$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_TYPE),$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_BASE_LAYER),$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_SOURCE_INCLUDE),$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_SOURCE_EXCLUDE),$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_CACHE_KEY_FILE),$(LAYER_03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63_ARCHIVE_FILE))) diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 64c34d4b0..a1ef6c0c9 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: 46c0c7714dcaa1d0 +lockid: 6cd3353dfe5a6bf9 packagespec-version: 0.2.2 cache-version: 10 packages: - - packagespecid: 01433dc5a2317cbdfccff5f5a70a802585c09d99 + - packagespecid: b44cab2d26b1c045151c8748f823036c2f2f064f inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -22,33 +22,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f POST_PROCESSORS: apple-notarize av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-01433dc5a2317cbdfccff5f5a70a802585c09d99-{{checksum ".buildcache/cache-keys/package-01433dc5a2317cbdfccff5f5a70a802585c09d99"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-b44cab2d26b1c045151c8748f823036c2f2f064f-{{checksum ".buildcache/cache-keys/package-b44cab2d26b1c045151c8748f823036c2f2f064f"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_darwin_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_darwin_amd64.zip - - packagespecid: 55764fcd4564716267ccfec3f3bbe2d5e7c1394a + - packagespecid: 524dbd03848c946e20de0aac8d5254908bca362d inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -65,33 +65,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a-{{checksum ".buildcache/cache-keys/package-55764fcd4564716267ccfec3f3bbe2d5e7c1394a"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-524dbd03848c946e20de0aac8d5254908bca362d-{{checksum ".buildcache/cache-keys/package-524dbd03848c946e20de0aac8d5254908bca362d"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_freebsd_386.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_freebsd_386.zip - - packagespecid: 0b738a815a88ac698cdac9320f60b8845476ccf1 + - packagespecid: 678afe01c4b1e5bc200431da47b55c4a077c2d56 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -108,33 +108,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-0b738a815a88ac698cdac9320f60b8845476ccf1-{{checksum ".buildcache/cache-keys/package-0b738a815a88ac698cdac9320f60b8845476ccf1"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-678afe01c4b1e5bc200431da47b55c4a077c2d56-{{checksum ".buildcache/cache-keys/package-678afe01c4b1e5bc200431da47b55c4a077c2d56"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_freebsd_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_freebsd_amd64.zip - - packagespecid: 787e1b5aa3421c688a8af29743f73146cb58bb3b + - packagespecid: 2142f71e9cd5098224a7d0bfb22042569a0523db inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -151,33 +151,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-787e1b5aa3421c688a8af29743f73146cb58bb3b-{{checksum ".buildcache/cache-keys/package-787e1b5aa3421c688a8af29743f73146cb58bb3b"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-2142f71e9cd5098224a7d0bfb22042569a0523db-{{checksum ".buildcache/cache-keys/package-2142f71e9cd5098224a7d0bfb22042569a0523db"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_freebsd_arm.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_freebsd_arm.zip - - packagespecid: a25dfd64da01479f42cb88cc13fec056c685cfce + - packagespecid: 1dfbef246de63b29459505ccae17adbe07b5f430 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -194,33 +194,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-a25dfd64da01479f42cb88cc13fec056c685cfce-{{checksum ".buildcache/cache-keys/package-a25dfd64da01479f42cb88cc13fec056c685cfce"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-1dfbef246de63b29459505ccae17adbe07b5f430-{{checksum ".buildcache/cache-keys/package-1dfbef246de63b29459505ccae17adbe07b5f430"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_linux_386.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_linux_386.zip - - packagespecid: a87eb17f530931a4e0f823371d8378cd8c5f9e7a + - packagespecid: 8e95d6a584eb3d67acc1229d751e5d138221ec3e inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -237,33 +237,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a-{{checksum ".buildcache/cache-keys/package-a87eb17f530931a4e0f823371d8378cd8c5f9e7a"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-8e95d6a584eb3d67acc1229d751e5d138221ec3e-{{checksum ".buildcache/cache-keys/package-8e95d6a584eb3d67acc1229d751e5d138221ec3e"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_linux_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_linux_amd64.zip - - packagespecid: 7e9c0c8225db5f23ed0f4e34c30b1267a86956c8 + - packagespecid: 372a1da4d10d0a167beea7aa4a21009db23cb2f9 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -280,33 +280,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8-{{checksum ".buildcache/cache-keys/package-7e9c0c8225db5f23ed0f4e34c30b1267a86956c8"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-372a1da4d10d0a167beea7aa4a21009db23cb2f9-{{checksum ".buildcache/cache-keys/package-372a1da4d10d0a167beea7aa4a21009db23cb2f9"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_linux_arm.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_linux_arm.zip - - packagespecid: 7c4c77fabb7438b01bd4da25bc8712068ffe0e1a + - packagespecid: 2cee420d0a27d5e69ddc4618521a5dc74c0b7481 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -323,33 +323,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a-{{checksum ".buildcache/cache-keys/package-7c4c77fabb7438b01bd4da25bc8712068ffe0e1a"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481-{{checksum ".buildcache/cache-keys/package-2cee420d0a27d5e69ddc4618521a5dc74c0b7481"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_linux_arm64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_linux_arm64.zip - - packagespecid: d2ccbfae1e7e530b048a21d5a8d175334405d5e1 + - packagespecid: 66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -366,33 +366,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1-{{checksum ".buildcache/cache-keys/package-d2ccbfae1e7e530b048a21d5a8d175334405d5e1"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9-{{checksum ".buildcache/cache-keys/package-66e8bc38a13739a3912a8b5e9ca76a9b6d5dd3e9"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_netbsd_386.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_netbsd_386.zip - - packagespecid: 0fdd9e880642ccba5cf231cc680b66b52a89cb01 + - packagespecid: 766ea58fe7a1bade33b6fe51ca82195dee5e0a32 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -409,33 +409,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-0fdd9e880642ccba5cf231cc680b66b52a89cb01-{{checksum ".buildcache/cache-keys/package-0fdd9e880642ccba5cf231cc680b66b52a89cb01"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32-{{checksum ".buildcache/cache-keys/package-766ea58fe7a1bade33b6fe51ca82195dee5e0a32"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_netbsd_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_netbsd_amd64.zip - - packagespecid: a2bfe5eec302a06a0e42f1664a43866fc9325495 + - packagespecid: 0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -452,33 +452,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-a2bfe5eec302a06a0e42f1664a43866fc9325495-{{checksum ".buildcache/cache-keys/package-a2bfe5eec302a06a0e42f1664a43866fc9325495"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc-{{checksum ".buildcache/cache-keys/package-0b79940d9b05e64db376b5ac2336ea4b1c9e5ecc"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_openbsd_386.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_openbsd_386.zip - - packagespecid: b5e41e598aedaa5f8ca29187ae0df28d92c076d5 + - packagespecid: e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -495,33 +495,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5-{{checksum ".buildcache/cache-keys/package-b5e41e598aedaa5f8ca29187ae0df28d92c076d5"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee-{{checksum ".buildcache/cache-keys/package-e7f0eaaa2c650e2a0ec807a404c5ee17a88aefee"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_openbsd_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_openbsd_amd64.zip - - packagespecid: a32051cd510b4cba9457ce1d3349f12ffd73b6c6 + - packagespecid: b0676047f322eb760146c868d9014f1baa969104 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -538,33 +538,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104 POST_PROCESSORS: av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6-{{checksum ".buildcache/cache-keys/package-a32051cd510b4cba9457ce1d3349f12ffd73b6c6"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-b0676047f322eb760146c868d9014f1baa969104-{{checksum ".buildcache/cache-keys/package-b0676047f322eb760146c868d9014f1baa969104"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local path: boundary_0.2.0_solaris_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_solaris_amd64.zip - - packagespecid: 184227cfb70db0b424c6ed94229d21546f94e59d + - packagespecid: 89eb36dd3e2bdfb20509565f1f7bf7d206fd5554 inputs: BINARY_NAME: boundary.exe BUILD_TAGS: ui @@ -581,33 +581,33 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554 POST_PROCESSORS: microsoft-notarize av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-184227cfb70db0b424c6ed94229d21546f94e59d-{{checksum ".buildcache/cache-keys/package-184227cfb70db0b424c6ed94229d21546f94e59d"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554-{{checksum ".buildcache/cache-keys/package-89eb36dd3e2bdfb20509565f1f7bf7d206fd5554"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary.exe ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary.exe aliases: - type: local path: boundary_0.2.0_windows_386.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_windows_386.zip - - packagespecid: c092c3cb3b0586a50816d6629890cf4a2542cec9 + - packagespecid: 43b9906bfdd0aecb91a30b465e92f7502ee9e9c4 inputs: BINARY_NAME: boundary.exe BUILD_TAGS: ui @@ -624,49 +624,49 @@ packages: builtin: BUILD_LAYERS: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4 POST_PROCESSORS: microsoft-notarize av-scan circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} - PACKAGE_CACHE_KEY: package-c092c3cb3b0586a50816d6629890cf4a2542cec9-{{checksum ".buildcache/cache-keys/package-c092c3cb3b0586a50816d6629890cf4a2542cec9"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} + PACKAGE_CACHE_KEY: package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4-{{checksum ".buildcache/cache-keys/package-43b9906bfdd0aecb91a30b465e92f7502ee9e9c4"}} 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.2.0 -X $VERSION_PKG_PATH.VersionPrerelease=" -o $OUTPUT_DIR/boundary.exe ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary.exe aliases: - type: local path: boundary_0.2.0_windows_amd64.zip - type: public-hc-releases path: boundary/boundary_0.2.0/boundary_0.2.0_windows_amd64.zip -base-image: docker.mirror.hashicorp.services/golang@sha256:2b7f8090d63788525c18f580b4ab30a7ca3fd381ca16227e5cfbe4d0443ee71e +base-image: docker.mirror.hashicorp.services/golang@sha256:2ff1a0d92edf6c2d4a2dd0d6bfa43e512c8b2f3aac738ffbb6195caf7cb38164 layers: - depth: 0 final: false type: base - id: ee8404894ff76e881ab504662f5939942211534b - name: 00-base-ee8404894ff76e881ab504662f5939942211534b + id: acb5298039d979012605aa8af44f1cb03bc34809 + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 parentname: "" parenttype: "" parentid: "" - cachekeyfile: .buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b + cachekeyfile: .buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809 sourceinclude: "" sourceexclude: "" - archivefile: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz + archivefile: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz dockerfile: | # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental - FROM docker.mirror.hashicorp.services/golang@sha256:2b7f8090d63788525c18f580b4ab30a7ca3fd381ca16227e5cfbe4d0443ee71e + FROM docker.mirror.hashicorp.services/golang@sha256:2ff1a0d92edf6c2d4a2dd0d6bfa43e512c8b2f3aac738ffbb6195caf7cb38164 COPY . ./ ENV \ GOPATH= \ @@ -680,31 +680,29 @@ layers: | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ && apt-get install -yq yarn zip \ - && rm -rf /var/lib/apt/lists/* \ - && go get github.com/go-bindata/go-bindata/v3/go-bindata \ - && go-bindata --version + && rm -rf /var/lib/apt/lists/* meta: builtin: LAYER_LIST: - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz circleci: CACHE_KEY_PREFIX_LIST: - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} childcount: 1 - depth: 1 final: false type: ui - id: 4fd955a556287609732f32e61ba9b2718113af93 - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - parentname: 00-base-ee8404894ff76e881ab504662f5939942211534b + id: 7643076cb6e153b7cbbdb1ae124196b6e055831d + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + parentname: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 parenttype: base - parentid: ee8404894ff76e881ab504662f5939942211534b - cachekeyfile: .buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93 + parentid: acb5298039d979012605aa8af44f1cb03bc34809 + cachekeyfile: .buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d sourceinclude: internal/ui/VERSION sourceexclude: "" - archivefile: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + archivefile: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz dockerfile: | # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE @@ -712,45 +710,40 @@ layers: COPY . ./ RUN \ SHA="$(head -n1 internal/ui/VERSION | cut -d ' ' -f1)" \ - && DIR=internal/ui/source/boundary-ui \ + && DIR=internal/ui/.tmp/boundary-ui \ && mkdir -p "$(dirname "$DIR")" \ && git clone https://github.com/hashicorp/boundary-ui "$DIR" \ && ( cd "$DIR" \ && git fetch origin "$SHA" \ && git checkout "$SHA" \ && yarn install \ - && yarn build:ui:admin; ) \ - && TARGET=internal/ui/assets.go \ - && UIDIR="$DIR/ui/admin/dist" \ - && go-bindata -fs -o "$TARGET" -pkg ui \ - -prefix "$UIDIR" "$UIDIR" "$UIDIR/assets" \ - && rm -rf "$DIR" + && yarn build:ui:admin; ) meta: builtin: LAYER_LIST: - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz circleci: CACHE_KEY_PREFIX_LIST: - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} childcount: 1 - depth: 2 final: false type: go-modules - id: 04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - parentname: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 + id: 28439835ef58deab2d0b0cda96d72784d77871bd + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + parentname: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d parenttype: ui - parentid: 4fd955a556287609732f32e61ba9b2718113af93 - cachekeyfile: .buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 + parentid: 7643076cb6e153b7cbbdb1ae124196b6e055831d + cachekeyfile: .buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd sourceinclude: go.mod go.sum */go.mod */go.sum sourceexclude: "" - archivefile: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + archivefile: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz dockerfile: | # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE @@ -761,32 +754,32 @@ layers: builtin: LAYER_LIST: - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz circleci: CACHE_KEY_PREFIX_LIST: - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} childcount: 1 - depth: 3 final: true type: copy-source - id: e304212c51acc8855fd41314bdf3edf417854c49 - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - parentname: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 + id: 7c4665642b5165959a3b5c0359ec4f9263440c63 + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + parentname: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd parenttype: go-modules - parentid: 04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - cachekeyfile: .buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49 + parentid: 28439835ef58deab2d0b0cda96d72784d77871bd + cachekeyfile: .buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 sourceinclude: '*.go' sourceexclude: "" - archivefile: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + archivefile: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz dockerfile: | # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE @@ -796,21 +789,21 @@ layers: builtin: LAYER_LIST: - type: copy-source - name: 03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49 - archive: .buildcache/archives/03-copy-source-e304212c51acc8855fd41314bdf3edf417854c49.tar.gz + name: 03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63 + archive: .buildcache/archives/03-copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63.tar.gz - type: go-modules - name: 02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3 - archive: .buildcache/archives/02-go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3.tar.gz + name: 02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd + archive: .buildcache/archives/02-go-modules-28439835ef58deab2d0b0cda96d72784d77871bd.tar.gz - type: ui - name: 01-ui-4fd955a556287609732f32e61ba9b2718113af93 - archive: .buildcache/archives/01-ui-4fd955a556287609732f32e61ba9b2718113af93.tar.gz + name: 01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d + archive: .buildcache/archives/01-ui-7643076cb6e153b7cbbdb1ae124196b6e055831d.tar.gz - type: base - name: 00-base-ee8404894ff76e881ab504662f5939942211534b - archive: .buildcache/archives/00-base-ee8404894ff76e881ab504662f5939942211534b.tar.gz + name: 00-base-acb5298039d979012605aa8af44f1cb03bc34809 + archive: .buildcache/archives/00-base-acb5298039d979012605aa8af44f1cb03bc34809.tar.gz circleci: CACHE_KEY_PREFIX_LIST: - - copy-source_e304_{{checksum ".buildcache/cache-keys/copy-source-e304212c51acc8855fd41314bdf3edf417854c49"}} - - go-modules_04f9_{{checksum ".buildcache/cache-keys/go-modules-04f9156a8254ae7f9f04b5f6cee2e18b15cd83b3"}} - - ui_4fd9_{{checksum ".buildcache/cache-keys/ui-4fd955a556287609732f32e61ba9b2718113af93"}} - - base_ee84_{{checksum ".buildcache/cache-keys/base-ee8404894ff76e881ab504662f5939942211534b"}} + - copy-source_7c46_{{checksum ".buildcache/cache-keys/copy-source-7c4665642b5165959a3b5c0359ec4f9263440c63"}} + - go-modules_2843_{{checksum ".buildcache/cache-keys/go-modules-28439835ef58deab2d0b0cda96d72784d77871bd"}} + - ui_7643_{{checksum ".buildcache/cache-keys/ui-7643076cb6e153b7cbbdb1ae124196b6e055831d"}} + - base_acb5_{{checksum ".buildcache/cache-keys/base-acb5298039d979012605aa8af44f1cb03bc34809"}} childcount: 0 diff --git a/packages-oss.yml b/packages-oss.yml index 70a7ac6e6..31ce24c00 100644 --- a/packages-oss.yml +++ b/packages-oss.yml @@ -50,8 +50,8 @@ package-aliases: template: >- boundary/{{.BUNDLE_NAME}}/{{.BUNDLE_NAME}}_{{.GOOS}}_{{.GOARCH}}.zip -# golang:1.15.11-buster -base-image: "docker.mirror.hashicorp.services/golang@sha256:2b7f8090d63788525c18f580b4ab30a7ca3fd381ca16227e5cfbe4d0443ee71e" +# golang:1.16.3-buster +base-image: "docker.mirror.hashicorp.services/golang@sha256:2ff1a0d92edf6c2d4a2dd0d6bfa43e512c8b2f3aac738ffbb6195caf7cb38164" layers: - name: base @@ -68,28 +68,21 @@ layers: | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ && apt-get install -yq yarn zip \ - && rm -rf /var/lib/apt/lists/* \ - && go get github.com/go-bindata/go-bindata/v3/go-bindata \ - && go-bindata --version + && rm -rf /var/lib/apt/lists/* - name: ui source-include: internal/ui/VERSION dockerfile: | RUN \ SHA="$(head -n1 internal/ui/VERSION | cut -d ' ' -f1)" \ - && DIR=internal/ui/source/boundary-ui \ + && DIR=internal/ui/.tmp/boundary-ui \ && mkdir -p "$(dirname "$DIR")" \ && git clone https://github.com/hashicorp/boundary-ui "$DIR" \ && ( cd "$DIR" \ && git fetch origin "$SHA" \ && git checkout "$SHA" \ && yarn install \ - && yarn build:ui:admin; ) \ - && TARGET=internal/ui/assets.go \ - && UIDIR="$DIR/ui/admin/dist" \ - && go-bindata -fs -o "$TARGET" -pkg ui \ - -prefix "$UIDIR" "$UIDIR" "$UIDIR/assets" \ - && rm -rf "$DIR" + && yarn build:ui:admin; ) - name: go-modules source-include: "go.mod go.sum */go.mod */go.sum" diff --git a/scripts/uigen.sh b/scripts/uigen.sh index 69b9d9e6d..5486c9eed 100755 --- a/scripts/uigen.sh +++ b/scripts/uigen.sh @@ -16,11 +16,3 @@ fi echo "Please ensure Node v14+ and Yarn v1.22.10+ are installed." fi ) - -uidir="${UI_CLONE_DIR}/ui/admin/dist" - -go-bindata -fs -o "$UI_ASSETS_FILE.tmp" -pkg ui -prefix "${uidir}" "${uidir}" "${uidir}/assets" - -printf "// +build ui\n" > "$UI_ASSETS_FILE" -cat "$UI_ASSETS_FILE.tmp" >> "$UI_ASSETS_FILE" -rm "$UI_ASSETS_FILE.tmp" diff --git a/tools/tools.go b/tools/tools.go index 4009d58ca..3d29c1a44 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -21,7 +21,6 @@ package tools //go:generate go install golang.org/x/tools/cmd/goimports //go:generate go install github.com/oligot/go-mod-upgrade //go:generate go install github.com/mitchellh/gox -//go:generate go install github.com/go-bindata/go-bindata/v3/go-bindata //go:generate go install google.golang.org/protobuf/cmd/protoc-gen-go //go:generate go install google.golang.org/grpc/cmd/protoc-gen-go-grpc @@ -42,8 +41,6 @@ import ( _ "github.com/mitchellh/gox" - _ "github.com/go-bindata/go-bindata/v3/go-bindata" - _ "google.golang.org/protobuf/cmd/protoc-gen-go" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"