From d4afe0065b76ec7c44e9d00b1f95b46b189043f0 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Mon, 15 Jul 2024 09:53:33 -0600 Subject: [PATCH] fix(ci): snapshot release publish, passthrough test on upgrade (#575) ## Description Publish fix: - Tested on fork - https://github.com/BagelLab/uds-core/actions/runs/9941861638 - Expected failure based on lack of pull creds, but publish is using the correct versions - Also confirmed the normal publish still behaves as expected - https://github.com/BagelLab/uds-core/actions/runs/9941914969 Passthrough test fix - enables all components during upgrade deploy tasks. ## Related Issue N/A ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md) followed --- .github/workflows/publish.yaml | 5 +++-- tasks/deploy.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0d44331b1..e51bd9b1b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -38,6 +38,7 @@ jobs: SHORT_SHA=$(git rev-parse --short HEAD) RELEASE_DATE=$(date +'%Y-%m-%d') echo "SNAPSHOT_VERSION=${RELEASE_DATE}-${SHORT_SHA}" >> $GITHUB_ENV + echo "PUBLISH_ARGS=--set VERSION=${RELEASE_DATE}-${SHORT_SHA}" >> $GITHUB_ENV - name: (Snapshot) Set versions to snapshot if: ${{ inputs.snapshot }} @@ -92,11 +93,11 @@ jobs: # Publish package and bundle to destination repository - name: Publish Standard Package - run: uds run -f tasks/publish.yaml standard-package --set FLAVOR=${{ matrix.flavor }} --set TARGET_REPO=${{ steps.repo.outputs.repo }} --no-progress + run: uds run -f tasks/publish.yaml standard-package --set FLAVOR=${{ matrix.flavor }} --set TARGET_REPO=${{ steps.repo.outputs.repo }} ${PUBLISH_ARGS} --no-progress - name: Publish Upstream Flavored Bundles if: ${{ matrix.flavor == 'upstream' }} - run: uds run -f tasks/publish.yaml bundles --set TARGET_REPO=${{ steps.repo.outputs.repo }} --no-progress + run: uds run -f tasks/publish.yaml bundles --set TARGET_REPO=${{ steps.repo.outputs.repo }} ${PUBLISH_ARGS} --no-progress - name: Save logs if: always() diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index 25a517074..b4deb8e64 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -39,9 +39,9 @@ tasks: setVariables: - name: LATEST_VERSION - description: "Deploy the latest UDS Core package release" - cmd: uds zarf package deploy oci://ghcr.io/defenseunicorns/packages/uds/core:${LATEST_VERSION} --confirm --no-progress + cmd: uds zarf package deploy oci://ghcr.io/defenseunicorns/packages/uds/core:${LATEST_VERSION} --confirm --no-progress --components '*' - name: standard-package actions: - description: "Deploy the standard UDS Core zarf package" - cmd: uds zarf package deploy build/zarf-package-core-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress + cmd: uds zarf package deploy build/zarf-package-core-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress --components '*'