diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml index 89d6b6d..5760c7a 100644 --- a/.github/workflows/tag-and-release.yaml +++ b/.github/workflows/tag-and-release.yaml @@ -28,7 +28,7 @@ jobs: permissions: contents: read packages: write - + steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -41,13 +41,13 @@ jobs: - name: Iron Bank Login run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil - + - name: Login to GHCR uses: docker/login-action@v3 with: registry: ghcr.io username: dummy password: ${{ secrets.GITHUB_TOKEN }} - + - name: Publish Package run: uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ae5a797..6fc1b61 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,7 +27,7 @@ jobs: - name: Environment setup uses: ./.github/actions/setup - + - name: Iron Bank Login run: zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil @@ -36,7 +36,7 @@ jobs: - name: Setup cluster run: uds run setup-cluster - + - name: Deploy test bundle run: uds run deploy-test-bundle diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 8d9fdaa..65d09b6 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -6,7 +6,7 @@ metadata: version: 4.12.0-uds.0 # x-release-please-end -packages: +packages: - name: jenkins path: ../ # x-release-please-start-version diff --git a/tasks.yaml b/tasks.yaml index 3464e0f..2c3989b 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -9,7 +9,7 @@ tasks: - name: setup-cluster actions: - task: setup:k3d-test-cluster - + - name: create-package actions: - task: create:jenkins-package @@ -17,7 +17,7 @@ tasks: - name: create-test-bundle actions: - task: create:jenkins-test-bundle - + - name: deploy-package actions: - task: deploy:jenkins-package diff --git a/tasks/publish.yaml b/tasks/publish.yaml index 6430626..f4340ca 100644 --- a/tasks/publish.yaml +++ b/tasks/publish.yaml @@ -16,7 +16,7 @@ tasks: cmd: | set -e ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml jenkins-package --no-progress - + - description: Publish the packages cmd: | set -e