From 09f4cba527959df692a297db837857f2c466d98c Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Mon, 15 Jul 2024 08:51:33 -0600 Subject: [PATCH 1/3] fix(ci): snapshot release publish --- .github/workflows/publish.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0d44331b1..1d4e5adfb 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 ${SNAPSHOT_VERSION}" >> $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() From 234aa49a4fee611850cbe9e51fe75d2bd1b71da3 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Mon, 15 Jul 2024 09:08:15 -0600 Subject: [PATCH 2/3] fix: versioning env --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 1d4e5adfb..e51bd9b1b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -38,7 +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 ${SNAPSHOT_VERSION}" >> $GITHUB_ENV + echo "PUBLISH_ARGS=--set VERSION=${RELEASE_DATE}-${SHORT_SHA}" >> $GITHUB_ENV - name: (Snapshot) Set versions to snapshot if: ${{ inputs.snapshot }} From 47d734a8c1c7e938e5c4fd233296248967fc6f27 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Mon, 15 Jul 2024 09:20:27 -0600 Subject: [PATCH 3/3] fix(ci): passthrough issue on upgrade test --- tasks/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 '*'