diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d9d7ff1c8..6eb56d15be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,7 +147,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: a0ba97d1f6d539dc949e65f4f0859e8823062c37 + - PACKAGE_SPEC_ID: e743b041278cec53847ec7028ebadc3ad5669de2 steps: - setup_remote_docker: version: 19.03.12 @@ -159,7 +159,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: cache006-package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}} + key: cache006-package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}} name: Restore package cache - run: command: | @@ -205,7 +205,7 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: cache006-package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}} + key: cache006-package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}} name: Saving package cache paths: - .buildcache/packages/store @@ -217,7 +217,7 @@ jobs: - AUTO_INSTALL_TOOLS: 'YES' - BUILDKIT_PROGRESS: plain - PRODUCT_REVISION: '' - - PACKAGE_SPEC_ID: 556901dfda0ede9e6e44f06371985480234f7b8f + - PACKAGE_SPEC_ID: 4f1bfeb2a667fafd083e3110d6ee2a714360a71a steps: - setup_remote_docker: version: 19.03.12 @@ -229,7 +229,7 @@ jobs: command: make -C packages*.lock write-package-cache-key name: Write package cache key - restore_cache: - key: cache006-package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}} + key: cache006-package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}} name: Restore package cache - run: command: | @@ -275,7 +275,147 @@ jobs: command: ls -lahR .buildcache/packages name: List packages - save_cache: - key: cache006-package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}} + key: cache006-package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}} + name: Saving package cache + paths: + - .buildcache/packages/store + windows_amd64_package: + docker: + - image: circleci/buildpack-deps + shell: /usr/bin/env bash -euo pipefail -c + environment: + - AUTO_INSTALL_TOOLS: 'YES' + - BUILDKIT_PROGRESS: plain + - PRODUCT_REVISION: '' + - PACKAGE_SPEC_ID: 2a15eca7152565d54650450b74e49f13fa3aa635 + steps: + - setup_remote_docker: + version: 19.03.12 + - add_ssh_keys: + fingerprints: + - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - checkout + - run: + command: make -C packages*.lock write-package-cache-key + name: Write package cache key + - restore_cache: + key: cache006-package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}} + name: Restore package cache + - run: + command: | + if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then + echo "No package found, continuing with build." + exit 0 + fi + echo "Package already cached, skipping build." + circleci-agent step halt + name: Check the cache status. + - run: + command: make -C packages*.lock write-builder-cache-keys + name: Write builder layer cache keys + - restore_cache: + keys: + - cache006-copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} + - cache006-go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} + - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} + - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} + name: Restore build layer cache + - run: + command: | + make -C packages*.lock load-builder-cache + name: Load whatever builder cache we have (if any) into the Docker daemon + no_output_timeout: 30m + - run: + command: |2 + + KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98" + eval "$(ssh-agent -s)" + if [ -f "$KEYFILE" ]; then + ssh-add "$KEYFILE" + else + echo "==> INFO: SSH key for github.com not found" + echo " Attempts to access private repositories from within" + echo " the build will fail, e.g. for private go modules, or" + echo " attempts to directly clone private repositories." + fi + + make -C packages*.lock package + name: Compile Package + - run: + command: ls -lahR .buildcache/packages + name: List packages + - save_cache: + key: cache006-package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}} + name: Saving package cache + paths: + - .buildcache/packages/store + freebsd_amd64_package: + docker: + - image: circleci/buildpack-deps + shell: /usr/bin/env bash -euo pipefail -c + environment: + - AUTO_INSTALL_TOOLS: 'YES' + - BUILDKIT_PROGRESS: plain + - PRODUCT_REVISION: '' + - PACKAGE_SPEC_ID: a39b6fcb6a55e71b7a72b2631cff69c1e4943323 + steps: + - setup_remote_docker: + version: 19.03.12 + - add_ssh_keys: + fingerprints: + - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98 + - checkout + - run: + command: make -C packages*.lock write-package-cache-key + name: Write package cache key + - restore_cache: + key: cache006-package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}} + name: Restore package cache + - run: + command: | + if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then + echo "No package found, continuing with build." + exit 0 + fi + echo "Package already cached, skipping build." + circleci-agent step halt + name: Check the cache status. + - run: + command: make -C packages*.lock write-builder-cache-keys + name: Write builder layer cache keys + - restore_cache: + keys: + - cache006-copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} + - cache006-go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} + - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} + - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} + name: Restore build layer cache + - run: + command: | + make -C packages*.lock load-builder-cache + name: Load whatever builder cache we have (if any) into the Docker daemon + no_output_timeout: 30m + - run: + command: |2 + + KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98" + eval "$(ssh-agent -s)" + if [ -f "$KEYFILE" ]; then + ssh-add "$KEYFILE" + else + echo "==> INFO: SSH key for github.com not found" + echo " Attempts to access private repositories from within" + echo " the build will fail, e.g. for private go modules, or" + echo " attempts to directly clone private repositories." + fi + + make -C packages*.lock package + name: Compile Package + - run: + command: ls -lahR .buildcache/packages + name: List packages + - save_cache: + key: cache006-package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}} name: Saving package cache paths: - .buildcache/packages/store @@ -289,21 +429,37 @@ jobs: command: make -C packages*.lock write-all-package-cache-keys name: Write all package cache keys - restore_cache: - key: cache006-package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}} + key: cache006-package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}} - run: command: | make package-meta environment: - PACKAGE_SPEC_ID: a0ba97d1f6d539dc949e65f4f0859e8823062c37 + PACKAGE_SPEC_ID: e743b041278cec53847ec7028ebadc3ad5669de2 name: Write package metadata for darwin_amd64_package - restore_cache: - key: cache006-package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}} + key: cache006-package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}} - run: command: | make package-meta environment: - PACKAGE_SPEC_ID: 556901dfda0ede9e6e44f06371985480234f7b8f + PACKAGE_SPEC_ID: 4f1bfeb2a667fafd083e3110d6ee2a714360a71a name: Write package metadata for linux_amd64_package + - restore_cache: + key: cache006-package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}} + - run: + command: | + make package-meta + environment: + PACKAGE_SPEC_ID: 2a15eca7152565d54650450b74e49f13fa3aa635 + name: Write package metadata for windows_amd64_package + - restore_cache: + key: cache006-package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}} + - run: + command: | + make package-meta + environment: + PACKAGE_SPEC_ID: a39b6fcb6a55e71b7a72b2631cff69c1e4943323 + name: Write package metadata for freebsd_amd64_package - run: command: make aliases name: Write package aliases @@ -482,10 +638,18 @@ workflows: - linux_amd64_package: requires: - build-common-layers + - windows_amd64_package: + requires: + - build-common-layers + - freebsd_amd64_package: + requires: + - build-common-layers - bundle-releases: requires: - darwin_amd64_package - linux_amd64_package + - windows_amd64_package + - freebsd_amd64_package default: jobs: - build diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml index 6bb93f32c1..984b388a19 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -31,10 +31,14 @@ workflows: - build-common-layers - darwin_amd64_package: { requires: [ build-common-layers ] } - linux_amd64_package: { requires: [ build-common-layers ] } + - windows_amd64_package: { requires: [ build-common-layers ] } + - freebsd_amd64_package: { requires: [ build-common-layers ] } - bundle-releases: requires: - darwin_amd64_package - linux_amd64_package + - windows_amd64_package + - freebsd_amd64_package jobs: build-common-layers: executor: builder-machine @@ -168,7 +172,7 @@ jobs: darwin_amd64_package: executor: builder environment: - - PACKAGE_SPEC_ID: a0ba97d1f6d539dc949e65f4f0859e8823062c37 + - PACKAGE_SPEC_ID: e743b041278cec53847ec7028ebadc3ad5669de2 steps: - setup_remote_docker: @@ -186,7 +190,7 @@ jobs: - write-package-cache-key - restore_cache: name: Restore package cache - key: 'cache006-package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}}' + key: 'cache006-package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}}' - run: name: Check the cache status. command: | @@ -234,7 +238,7 @@ jobs: command: ls -lahR .buildcache/packages - save_cache: name: Saving package cache - key: 'cache006-package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}}' + key: 'cache006-package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}}' paths: - .buildcache/packages/store # Save builder image cache if necessary. @@ -243,7 +247,7 @@ jobs: linux_amd64_package: executor: builder environment: - - PACKAGE_SPEC_ID: 556901dfda0ede9e6e44f06371985480234f7b8f + - PACKAGE_SPEC_ID: 4f1bfeb2a667fafd083e3110d6ee2a714360a71a steps: - setup_remote_docker: @@ -261,7 +265,7 @@ jobs: - write-package-cache-key - restore_cache: name: Restore package cache - key: 'cache006-package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}}' + key: 'cache006-package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}}' - run: name: Check the cache status. command: | @@ -309,7 +313,157 @@ jobs: command: ls -lahR .buildcache/packages - save_cache: name: Saving package cache - key: 'cache006-package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}}' + key: 'cache006-package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}}' + paths: + - .buildcache/packages/store + # Save builder image cache if necessary. + # The range should only iterate over a single layer. + + windows_amd64_package: + executor: builder + environment: + - PACKAGE_SPEC_ID: 2a15eca7152565d54650450b74e49f13fa3aa635 + steps: + + - setup_remote_docker: + version: 19.03.12 + + - add_ssh_keys: + fingerprints: + # hashicorp-ci github user. + - "c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98" + + + - checkout + + # Restore the package cache first, we might not need to rebuild. + - write-package-cache-key + - restore_cache: + name: Restore package cache + key: 'cache006-package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}}' + - run: + name: Check the cache status. + command: | + if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then + echo "No package found, continuing with build." + exit 0 + fi + echo "Package already cached, skipping build." + circleci-agent step halt + + # We need to rebuild, so load the builder cache. + - write-build-layer-cache-keys + - restore_cache: + name: Restore build layer cache + keys: + - cache006-copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} + - cache006-go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} + - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} + - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} + - run: + name: Load whatever builder cache we have (if any) into the Docker daemon + no_output_timeout: 30m + command: | + make -C packages*.lock load-builder-cache + + - run: + name: Compile Package + command: | + + KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98" + eval "$(ssh-agent -s)" + if [ -f "$KEYFILE" ]; then + ssh-add "$KEYFILE" + else + echo "==> INFO: SSH key for github.com not found" + echo " Attempts to access private repositories from within" + echo " the build will fail, e.g. for private go modules, or" + echo " attempts to directly clone private repositories." + fi + + make -C packages*.lock package + + - run: + name: List packages + command: ls -lahR .buildcache/packages + - save_cache: + name: Saving package cache + key: 'cache006-package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}}' + paths: + - .buildcache/packages/store + # Save builder image cache if necessary. + # The range should only iterate over a single layer. + + freebsd_amd64_package: + executor: builder + environment: + - PACKAGE_SPEC_ID: a39b6fcb6a55e71b7a72b2631cff69c1e4943323 + steps: + + - setup_remote_docker: + version: 19.03.12 + + - add_ssh_keys: + fingerprints: + # hashicorp-ci github user. + - "c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98" + + + - checkout + + # Restore the package cache first, we might not need to rebuild. + - write-package-cache-key + - restore_cache: + name: Restore package cache + key: 'cache006-package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}}' + - run: + name: Check the cache status. + command: | + if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then + echo "No package found, continuing with build." + exit 0 + fi + echo "Package already cached, skipping build." + circleci-agent step halt + + # We need to rebuild, so load the builder cache. + - write-build-layer-cache-keys + - restore_cache: + name: Restore build layer cache + keys: + - cache006-copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} + - cache006-go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} + - cache006-ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} + - cache006-base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} + - run: + name: Load whatever builder cache we have (if any) into the Docker daemon + no_output_timeout: 30m + command: | + make -C packages*.lock load-builder-cache + + - run: + name: Compile Package + command: | + + KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98" + eval "$(ssh-agent -s)" + if [ -f "$KEYFILE" ]; then + ssh-add "$KEYFILE" + else + echo "==> INFO: SSH key for github.com not found" + echo " Attempts to access private repositories from within" + echo " the build will fail, e.g. for private go modules, or" + echo " attempts to directly clone private repositories." + fi + + make -C packages*.lock package + + - run: + name: List packages + command: ls -lahR .buildcache/packages + - save_cache: + name: Saving package cache + key: 'cache006-package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}}' paths: - .buildcache/packages/store # Save builder image cache if necessary. @@ -324,17 +478,31 @@ jobs: - load-darwin_amd64_package - run: environment: - PACKAGE_SPEC_ID: a0ba97d1f6d539dc949e65f4f0859e8823062c37 + PACKAGE_SPEC_ID: e743b041278cec53847ec7028ebadc3ad5669de2 name: Write package metadata for darwin_amd64_package command: | make package-meta - load-linux_amd64_package - run: environment: - PACKAGE_SPEC_ID: 556901dfda0ede9e6e44f06371985480234f7b8f + PACKAGE_SPEC_ID: 4f1bfeb2a667fafd083e3110d6ee2a714360a71a name: Write package metadata for linux_amd64_package command: | make package-meta + - load-windows_amd64_package + - run: + environment: + PACKAGE_SPEC_ID: 2a15eca7152565d54650450b74e49f13fa3aa635 + name: Write package metadata for windows_amd64_package + command: | + make package-meta + - load-freebsd_amd64_package + - run: + environment: + PACKAGE_SPEC_ID: a39b6fcb6a55e71b7a72b2631cff69c1e4943323 + name: Write package metadata for freebsd_amd64_package + command: | + make package-meta - run: name: Write package aliases command: @@ -373,12 +541,22 @@ commands: load-darwin_amd64_package: steps: - restore_cache: - key: 'cache006-package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}}' + key: 'cache006-package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}}' load-linux_amd64_package: steps: - restore_cache: - key: 'cache006-package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}}' + key: 'cache006-package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}}' + + load-windows_amd64_package: + steps: + - restore_cache: + key: 'cache006-package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}}' + + load-freebsd_amd64_package: + steps: + - restore_cache: + key: 'cache006-package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}}' write-build-layer-cache-keys: diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index fc129a9073..57bf503747 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: 6d4efd667280d10d +lockid: 93a6ac5d68844c75 packagespec-version: 0.1.3 cache-version: 8 packages: -- packagespecid: a0ba97d1f6d539dc949e65f4f0859e8823062c37 +- packagespecid: e743b041278cec53847ec7028ebadc3ad5669de2 inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -13,12 +13,12 @@ packages: GOARCH: amd64 GOOS: darwin PRODUCT_NAME: boundary - PRODUCT_VERSION: 0.0.1 - PRODUCT_VERSION_MMP: 0.0.1 - PRODUCT_VERSION_PRE: '"''''"' + PRODUCT_VERSION: 0.1.0-beta.1 + PRODUCT_VERSION_MMP: 0.1.0 + PRODUCT_VERSION_PRE: beta.1 meta: BUILD_JOB_NAME: darwin_amd64_package - BUNDLE_NAME: boundary_0.0.1 + BUNDLE_NAME: boundary_0.1.0-beta.1 POST_PROCESSORS: apple-notarize av-scan builtin: BUILD_LAYERS: @@ -34,26 +34,26 @@ packages: - type: base name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37 + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2 circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} - go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - PACKAGE_CACHE_KEY: package-a0ba97d1f6d539dc949e65f4f0859e8823062c37-{{checksum - ".buildcache/cache-keys/package-a0ba97d1f6d539dc949e65f4f0859e8823062c37"}} + PACKAGE_CACHE_KEY: package-e743b041278cec53847ec7028ebadc3ad5669de2-{{checksum + ".buildcache/cache-keys/package-e743b041278cec53847ec7028ebadc3ad5669de2"}} build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; go build -x -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID - -X $VERSION_PKG_PATH.Version=0.0.1 -X $VERSION_PKG_PATH.VersionPrerelease="''"" + -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.1" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local - path: boundary_0.0.1_darwin_amd64.zip - - type: public-hc-releases - path: boundary/boundary_0.0.1/boundary_0.0.1_darwin_amd64.zip -- packagespecid: 556901dfda0ede9e6e44f06371985480234f7b8f + path: boundary_0.1.0-beta.1_darwin_amd64.zip + - type: github-releases + path: boundary_0.1.0-beta.1/boundary_0.1.0-beta.1_darwin_amd64.zip +- packagespecid: 4f1bfeb2a667fafd083e3110d6ee2a714360a71a inputs: BINARY_NAME: boundary BUILD_TAGS: ui @@ -61,12 +61,12 @@ packages: GOARCH: amd64 GOOS: linux PRODUCT_NAME: boundary - PRODUCT_VERSION: 0.0.1 - PRODUCT_VERSION_MMP: 0.0.1 - PRODUCT_VERSION_PRE: '"''''"' + PRODUCT_VERSION: 0.1.0-beta.1 + PRODUCT_VERSION_MMP: 0.1.0 + PRODUCT_VERSION_PRE: beta.1 meta: BUILD_JOB_NAME: linux_amd64_package - BUNDLE_NAME: boundary_0.0.1 + BUNDLE_NAME: boundary_0.1.0-beta.1 POST_PROCESSORS: av-scan builtin: BUILD_LAYERS: @@ -82,25 +82,121 @@ packages: - type: base name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz - PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a circleci: BUILDER_CACHE_KEY_PREFIX_LIST: - copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} - go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} - PACKAGE_CACHE_KEY: package-556901dfda0ede9e6e44f06371985480234f7b8f-{{checksum - ".buildcache/cache-keys/package-556901dfda0ede9e6e44f06371985480234f7b8f"}} + PACKAGE_CACHE_KEY: package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a-{{checksum + ".buildcache/cache-keys/package-4f1bfeb2a667fafd083e3110d6ee2a714360a71a"}} build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; go build -x -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID - -X $VERSION_PKG_PATH.Version=0.0.1 -X $VERSION_PKG_PATH.VersionPrerelease="''"" + -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.1" -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME boundary aliases: - type: local - path: boundary_0.0.1_linux_amd64.zip - - type: public-hc-releases - path: boundary/boundary_0.0.1/boundary_0.0.1_linux_amd64.zip + path: boundary_0.1.0-beta.1_linux_amd64.zip + - type: github-releases + path: boundary_0.1.0-beta.1/boundary_0.1.0-beta.1_linux_amd64.zip +- packagespecid: 2a15eca7152565d54650450b74e49f13fa3aa635 + inputs: + BINARY_NAME: boundary.exe + BUILD_TAGS: ui + CGO_ENABLED: "0" + GOARCH: amd64 + GOOS: windows + PRODUCT_NAME: boundary + PRODUCT_VERSION: 0.1.0-beta.1 + PRODUCT_VERSION_MMP: 0.1.0 + PRODUCT_VERSION_PRE: beta.1 + meta: + BUILD_JOB_NAME: windows_amd64_package + BUNDLE_NAME: boundary_0.1.0-beta.1 + POST_PROCESSORS: microsoft-notarize av-scan + builtin: + BUILD_LAYERS: + - type: copy-source + name: 03-copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9 + archive: .buildcache/archives/03-copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9.tar.gz + - type: go-modules + name: 02-go-modules-694e8500194e3b187b35bd9a40229f3bd215710e + archive: .buildcache/archives/02-go-modules-694e8500194e3b187b35bd9a40229f3bd215710e.tar.gz + - type: ui + name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d + archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz + - type: base + name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded + archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635 + circleci: + BUILDER_CACHE_KEY_PREFIX_LIST: + - copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} + - go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} + - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} + - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} + PACKAGE_CACHE_KEY: package-2a15eca7152565d54650450b74e49f13fa3aa635-{{checksum + ".buildcache/cache-keys/package-2a15eca7152565d54650450b74e49f13fa3aa635"}} + build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; + go build -x -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID + -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.1" + -o $OUTPUT_DIR/boundary.exe ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME + boundary.exe + aliases: + - type: local + path: boundary_0.1.0-beta.1_windows_amd64.zip + - type: github-releases + path: boundary_0.1.0-beta.1/boundary_0.1.0-beta.1_windows_amd64.zip +- packagespecid: a39b6fcb6a55e71b7a72b2631cff69c1e4943323 + inputs: + BINARY_NAME: boundary + BUILD_TAGS: ui + CGO_ENABLED: "0" + GOARCH: amd64 + GOOS: freebsd + PRODUCT_NAME: boundary + PRODUCT_VERSION: 0.1.0-beta.1 + PRODUCT_VERSION_MMP: 0.1.0 + PRODUCT_VERSION_PRE: beta.1 + meta: + BUILD_JOB_NAME: freebsd_amd64_package + BUNDLE_NAME: boundary_0.1.0-beta.1 + POST_PROCESSORS: av-scan + builtin: + BUILD_LAYERS: + - type: copy-source + name: 03-copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9 + archive: .buildcache/archives/03-copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9.tar.gz + - type: go-modules + name: 02-go-modules-694e8500194e3b187b35bd9a40229f3bd215710e + archive: .buildcache/archives/02-go-modules-694e8500194e3b187b35bd9a40229f3bd215710e.tar.gz + - type: ui + name: 01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d + archive: .buildcache/archives/01-ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d.tar.gz + - type: base + name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded + archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz + PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323 + circleci: + BUILDER_CACHE_KEY_PREFIX_LIST: + - copy-source_2bf2_{{checksum ".buildcache/cache-keys/copy-source-2bf23f8820c7f77d69c67cc1e898d73e3d002cc9"}} + - go-modules_694e_{{checksum ".buildcache/cache-keys/go-modules-694e8500194e3b187b35bd9a40229f3bd215710e"}} + - ui_5f82_{{checksum ".buildcache/cache-keys/ui-5f82d1f0cbf979ee051aa1ba0f7105483fa6947d"}} + - base_aac1_{{checksum ".buildcache/cache-keys/base-aac1d959b4b3af1495941602b5e51fb6181baded"}} + PACKAGE_CACHE_KEY: package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323-{{checksum + ".buildcache/cache-keys/package-a39b6fcb6a55e71b7a72b2631cff69c1e4943323"}} + build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; + go build -x -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID + -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.1" + -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME + boundary + aliases: + - type: local + path: boundary_0.1.0-beta.1_freebsd_amd64.zip + - type: github-releases + path: boundary_0.1.0-beta.1/boundary_0.1.0-beta.1_freebsd_amd64.zip base-image: golang@sha256:29452ef08bd0535f550c47b6034522c82ac10517b49c5f3b7a00035ecee0089e layers: - depth: 0 diff --git a/packages-oss.yml b/packages-oss.yml index cc3500129b..60a027c971 100644 --- a/packages-oss.yml +++ b/packages-oss.yml @@ -9,7 +9,7 @@ config: inputs: defaults: PRODUCT_NAME: boundary - PRODUCT_VERSION: 0.0.1 + PRODUCT_VERSION: 0.1.0-beta.1 BUILD_TAGS: ui CGO_ENABLED: 0 @@ -26,6 +26,8 @@ inputs: packages: - inputs: { GOOS: darwin, GOARCH: amd64 } - inputs: { GOOS: linux, GOARCH: amd64 } + - inputs: { GOOS: windows, GOARCH: amd64 } + - inputs: { GOOS: freebsd, GOARCH: amd64 } meta: defaults: @@ -43,9 +45,12 @@ package-aliases: - type: local template: >- {{.BUNDLE_NAME}}_{{.GOOS}}_{{.GOARCH}}.zip - - type: public-hc-releases + - type: github-releases template: >- - boundary/{{.BUNDLE_NAME}}/{{.BUNDLE_NAME}}_{{.GOOS}}_{{.GOARCH}}.zip + {{.BUNDLE_NAME}}/{{.BUNDLE_NAME}}_{{.GOOS}}_{{.GOARCH}}.zip +# - type: public-hc-releases +# template: >- +# boundary/{{.BUNDLE_NAME}}/{{.BUNDLE_NAME}}_{{.GOOS}}_{{.GOARCH}}.zip # golang@sha256:29452ef08bd0535f550c47b6034522c82ac10517b49c5f3b7a00035ecee0089e = golang:1.15.2-buster base-image: "golang@sha256:29452ef08bd0535f550c47b6034522c82ac10517b49c5f3b7a00035ecee0089e" diff --git a/version/version_base.go b/version/version_base.go index dd0c9b221c..3f02b94d12 100644 --- a/version/version_base.go +++ b/version/version_base.go @@ -9,7 +9,7 @@ var ( CgoEnabled bool // Version is set at compile time when using 'make build' or building in CI. - Version = "0.0.1" + Version = "" // VersionPrerelease is also set at compile time, similarly to Version. VersionPrerelease = ""