diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 25b089b..3791192 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -18,7 +18,7 @@ jobs: matrix: type: [install, upgrade] flavor: [upstream] - uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@c52077c870a576d01f169f96d74d1b393c6488ba # v1.1.2 + uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 with: flavor: ${{ matrix.flavor }} type: ${{ matrix.type }} diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 03c4917..77e0837 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -15,4 +15,4 @@ permissions: jobs: validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@c52077c870a576d01f169f96d74d1b393c6488ba # v1.1.2 + uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ee594a2..759797c 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,5 +15,5 @@ permissions: jobs: validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@c52077c870a576d01f169f96d74d1b393c6488ba # v1.1.2 + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 secrets: inherit diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ca6aef2..4f10977 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,7 +42,7 @@ jobs: timeout-minutes: 80 steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install UDS CLI uses: defenseunicorns/setup-uds@b987a32bac3baeb67bfb08f5e1544e2f9076ee8a # v1.0.0 diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index 1d7a6a5..7a03895 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -32,5 +32,5 @@ jobs: security-events: write # Used to receive a badge. id-token: write - uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@c52077c870a576d01f169f96d74d1b393c6488ba # v1.1.2 + uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0 secrets: inherit diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9a20909..5896312 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -48,7 +48,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 diff --git a/bundles/dev/uds-bundle.yaml b/bundles/dev/uds-bundle.yaml index c0910c5..fe81640 100644 --- a/bundles/dev/uds-bundle.yaml +++ b/bundles/dev/uds-bundle.yaml @@ -73,7 +73,7 @@ packages: - name: valkey repository: ghcr.io/defenseunicorns/packages/uds/valkey - ref: 7.2.6-uds.0-upstream + ref: 7.2.7-uds.0-upstream overrides: valkey: uds-valkey-config: @@ -113,7 +113,7 @@ packages: - name: gitlab repository: ghcr.io/defenseunicorns/packages/uds/gitlab - ref: 17.2.9-uds.0-upstream + ref: 17.3.6-uds.0-upstream overrides: gitlab: uds-gitlab-config: @@ -230,11 +230,11 @@ packages: - name: gitlab-runner repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner - ref: 17.2.1-uds.3-upstream + ref: 17.2.1-uds.4-upstream - name: valkey repository: ghcr.io/defenseunicorns/packages/uds/valkey - ref: 7.2.6-uds.0-upstream + ref: 7.2.7-uds.0-upstream overrides: valkey: valkey: @@ -289,7 +289,7 @@ packages: - name: mattermost repository: ghcr.io/defenseunicorns/packages/uds/mattermost - ref: 10.0.0-uds.1-upstream + ref: 10.1.1-uds.0-upstream imports: - name: ACCESS_KEY package: dev-secrets diff --git a/bundles/k3d-demo/uds-bundle.yaml b/bundles/k3d-demo/uds-bundle.yaml index 7ce4314..17c72d4 100644 --- a/bundles/k3d-demo/uds-bundle.yaml +++ b/bundles/k3d-demo/uds-bundle.yaml @@ -95,7 +95,7 @@ packages: - name: valkey repository: ghcr.io/defenseunicorns/packages/uds/valkey - ref: 7.2.6-uds.0-upstream + ref: 7.2.7-uds.0-upstream overrides: valkey: uds-valkey-config: @@ -135,7 +135,7 @@ packages: - name: gitlab repository: ghcr.io/defenseunicorns/packages/uds/gitlab - ref: 17.2.9-uds.0-upstream + ref: 17.3.6-uds.0-upstream overrides: gitlab: uds-gitlab-config: @@ -252,11 +252,11 @@ packages: - name: gitlab-runner repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner - ref: 17.2.1-uds.3-upstream + ref: 17.2.1-uds.4-upstream - name: valkey repository: ghcr.io/defenseunicorns/packages/uds/valkey - ref: 7.2.6-uds.0-upstream + ref: 7.2.7-uds.0-upstream overrides: valkey: valkey: @@ -311,7 +311,7 @@ packages: - name: mattermost repository: ghcr.io/defenseunicorns/packages/uds/mattermost - ref: 10.0.0-uds.1-upstream + ref: 10.1.1-uds.0-upstream imports: - name: ACCESS_KEY package: dev-secrets diff --git a/tasks.yaml b/tasks.yaml index 5dd966c..b3343dd 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -4,15 +4,13 @@ includes: - dependencies: ./tasks/dependencies.yaml - test: ./tasks/test.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/create.yaml - - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/publish.yaml - - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/lint.yaml - - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/pull.yaml - - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/deploy.yaml - - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/setup.yaml - - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/actions.yaml - - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/badge.yaml - - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.1.2/tasks/upgrade.yaml + - create-bundle: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/create.yaml + - deploy-bundle: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/deploy.yaml + - publish-bundle: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/publish.yaml + - pull-bundle: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/pull.yaml + - setup-bundle: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/setup.yaml + - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/lint.yaml + - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.2.0/tasks/actions.yaml variables: - name: BUNDLE_PATH @@ -22,22 +20,22 @@ tasks: - name: default description: Build and deploy SWF on UDS k3d-slim-dev actions: - - task: setup:k3d-test-cluster + - task: setup-bundle:k3d-test-cluster - task: create-deploy-test-bundle - name: create-deploy-test-bundle description: Test and validate cluster is deployed with the SWF Bundle actions: - task: dependencies:create - - task: create:test-bundle + - task: create-bundle:test-bundle with: path: ${BUNDLE_PATH} config: ${BUNDLE_PATH}/uds-config.yaml - - task: deploy:test-bundle + - task: deploy-bundle:test-bundle with: path: ${BUNDLE_PATH} config: ${BUNDLE_PATH}/uds-config.yaml - - task: setup:create-doug-user + - task: setup-bundle:create-doug-user - task: test:all # CI will execute the following (via uds-common/.github/actions/test) so they need to be here with these names @@ -45,18 +43,18 @@ tasks: - name: test-install description: Test the SWF bundle from the current branch actions: - - task: setup:k3d-test-cluster + - task: setup-bundle:k3d-test-cluster - task: create-deploy-test-bundle - name: test-upgrade description: Test an upgrade from the latest released bundle to the current branch actions: - - task: pull:latest-bundle-release + - task: pull-bundle:latest-bundle-release with: spoof_release: "true" path: ${BUNDLE_PATH} - - task: setup:k3d-test-cluster - - task: deploy:test-bundle + - task: setup-bundle:k3d-test-cluster + - task: deploy-bundle:test-bundle with: path: ${BUNDLE_PATH} config: ${BUNDLE_PATH}/uds-config.yaml @@ -66,12 +64,12 @@ tasks: description: Build and publish the bundles actions: - task: actions:determine-arch - - task: setup:k3d-test-cluster + - task: setup-bundle:k3d-test-cluster if: ${{ ne .variables.ARCH "arm64" }} - task: create-deploy-test-bundle if: ${{ ne .variables.ARCH "arm64" }} - description: Publish the bundle - - task: publish:test-bundle + - task: publish-bundle:test-bundle with: path: ${BUNDLE_PATH} # x-release-please-start-version diff --git a/tasks/test.yaml b/tasks/test.yaml index 544ab82..8385101 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -2,10 +2,10 @@ # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial includes: - - mm: https://raw.githubusercontent.com/defenseunicorns/uds-package-mattermost/v10.0.0-uds.1/tasks/test.yaml - - gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v17.2.9-uds.0/tasks/test.yaml + - mm: https://raw.githubusercontent.com/defenseunicorns/uds-package-mattermost/v10.1.1-uds.0/tasks/test.yaml + - gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v17.3.6-uds.0/tasks/test.yaml - sq: https://raw.githubusercontent.com/defenseunicorns/uds-package-sonarqube/v10.7.0-uds.0/tasks/test.yaml - - glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v17.2.1-uds.3/tasks/test.yaml + - glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v17.2.1-uds.4/tasks/test.yaml tasks: - name: all