Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update swf bundle dependencies #109

Merged
merged 2 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs-shim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions bundles/dev/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions bundles/k3d-demo/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
36 changes: 17 additions & 19 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,41 +20,41 @@ 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

- 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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down