diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f77a1c8c2..e5e534f0c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -349,76 +349,6 @@ jobs: 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: 3ea9166f458f56c1565fcf45fe049b931dafa85a - 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-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}} - 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_dde4_{{checksum ".buildcache/cache-keys/copy-source-dde49480ad145a6d7ce0f55c0d23e6f50c04d8d3"}} - - 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-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}} - name: Saving package cache - paths: - - .buildcache/packages/store bundle-releases: docker: - image: circleci/buildpack-deps @@ -452,14 +382,6 @@ jobs: environment: PACKAGE_SPEC_ID: 6b5bf7794d67cf76b1b4772807af52deb1f6a808 name: Write package metadata for windows_amd64_package - - restore_cache: - key: cache006-package-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}} - - run: - command: | - make package-meta - environment: - PACKAGE_SPEC_ID: 3ea9166f458f56c1565fcf45fe049b931dafa85a - name: Write package metadata for freebsd_amd64_package - run: command: make aliases name: Write package aliases @@ -641,15 +563,11 @@ workflows: - 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 c76622ce31..921e521ec9 100644 --- a/.circleci/config/@build-release.yml +++ b/.circleci/config/@build-release.yml @@ -32,13 +32,11 @@ workflows: - 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 @@ -394,81 +392,6 @@ jobs: # Save builder image cache if necessary. # The range should only iterate over a single layer. - freebsd_amd64_package: - executor: builder - environment: - - PACKAGE_SPEC_ID: 3ea9166f458f56c1565fcf45fe049b931dafa85a - 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-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}}' - - 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_dde4_{{checksum ".buildcache/cache-keys/copy-source-dde49480ad145a6d7ce0f55c0d23e6f50c04d8d3"}} - - 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-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}}' - paths: - - .buildcache/packages/store - # Save builder image cache if necessary. - # The range should only iterate over a single layer. - bundle-releases: executor: builder @@ -496,13 +419,6 @@ jobs: name: Write package metadata for windows_amd64_package command: | make package-meta - - load-freebsd_amd64_package - - run: - environment: - PACKAGE_SPEC_ID: 3ea9166f458f56c1565fcf45fe049b931dafa85a - name: Write package metadata for freebsd_amd64_package - command: | - make package-meta - run: name: Write package aliases command: @@ -553,11 +469,6 @@ commands: - restore_cache: key: 'cache006-package-6b5bf7794d67cf76b1b4772807af52deb1f6a808-{{checksum ".buildcache/cache-keys/package-6b5bf7794d67cf76b1b4772807af52deb1f6a808"}}' - load-freebsd_amd64_package: - steps: - - restore_cache: - key: 'cache006-package-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}}' - write-build-layer-cache-keys: steps: diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 476ad76519..57a3b2e20c 100644 --- a/packages-oss.lock/pkgs.yml +++ b/packages-oss.lock/pkgs.yml @@ -1,7 +1,7 @@ # *** # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # *** -lockid: 4344d637dfb974c4 +lockid: 748714d3a36e1911 packagespec-version: 0.1.3 cache-version: 8 packages: @@ -149,54 +149,6 @@ packages: path: boundary_0.1.0-beta.2_windows_amd64.zip - type: github-releases path: boundary_0.1.0-beta.2_windows_amd64.zip -- packagespecid: 3ea9166f458f56c1565fcf45fe049b931dafa85a - inputs: - BINARY_NAME: boundary - BUILD_TAGS: ui - CGO_ENABLED: "0" - GOARCH: amd64 - GOOS: freebsd - PRODUCT_NAME: boundary - PRODUCT_VERSION: 0.1.0-beta.2 - PRODUCT_VERSION_MMP: 0.1.0 - PRODUCT_VERSION_PRE: beta.2 - meta: - BUILD_JOB_NAME: freebsd_amd64_package - BUNDLE_NAME: boundary_0.1.0-beta.2 - POST_PROCESSORS: av-scan - builtin: - BUILD_LAYERS: - - type: copy-source - name: 03-copy-source-dde49480ad145a6d7ce0f55c0d23e6f50c04d8d3 - archive: .buildcache/archives/03-copy-source-dde49480ad145a6d7ce0f55c0d23e6f50c04d8d3.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-3ea9166f458f56c1565fcf45fe049b931dafa85a - circleci: - BUILDER_CACHE_KEY_PREFIX_LIST: - - copy-source_dde4_{{checksum ".buildcache/cache-keys/copy-source-dde49480ad145a6d7ce0f55c0d23e6f50c04d8d3"}} - - 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-3ea9166f458f56c1565fcf45fe049b931dafa85a-{{checksum - ".buildcache/cache-keys/package-3ea9166f458f56c1565fcf45fe049b931dafa85a"}} - build-command: VERSION_PKG_PATH=github.com/hashicorp/boundary/version; unset GOPATH; - go build -v -tags 'ui' -ldflags "-X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID - -X $VERSION_PKG_PATH.Version=0.1.0 -X $VERSION_PKG_PATH.VersionPrerelease=beta.2" - -o $OUTPUT_DIR/boundary ./cmd/boundary && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME - boundary - aliases: - - type: local - path: boundary_0.1.0-beta.2_freebsd_amd64.zip - - type: github-releases - path: boundary_0.1.0-beta.2_freebsd_amd64.zip base-image: golang@sha256:29452ef08bd0535f550c47b6034522c82ac10517b49c5f3b7a00035ecee0089e layers: - depth: 0 diff --git a/packages-oss.yml b/packages-oss.yml index c945168be7..9106732176 100644 --- a/packages-oss.yml +++ b/packages-oss.yml @@ -27,7 +27,6 @@ packages: - inputs: { GOOS: darwin, GOARCH: amd64 } - inputs: { GOOS: linux, GOARCH: amd64 } - inputs: { GOOS: windows, GOARCH: amd64 } - - inputs: { GOOS: freebsd, GOARCH: amd64 } meta: defaults: