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 #83

Merged
merged 2 commits into from
Jul 23, 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/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ on:
jobs:
validate:
name: Validate
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/setup@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
with:
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tag-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/setup@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
with:
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
Expand All @@ -67,10 +67,10 @@ jobs:

- name: Debug Output
if: ${{ always() }}
uses: defenseunicorns/uds-common/.github/actions/debug-output@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/debug-output@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/save-logs@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
with:
suffix: '${{ matrix.bundle }}-${{ matrix.flavor }}-${{ matrix.architecture }}-${{ github.run_id }}-${{ github.run_attempt }}'
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,25 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Environment setup
uses: defenseunicorns/uds-common/.github/actions/setup@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/setup@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
with:
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
ghToken: ${{ secrets.GITHUB_TOKEN }}

- name: Test
uses: defenseunicorns/uds-common/.github/actions/test@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/test@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
with:
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}
options: "--set BUNDLE_PATH=bundles/${{ matrix.bundle }}"

- name: Debug Output
if: ${{ always() }}
uses: defenseunicorns/uds-common/.github/actions/debug-output@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/debug-output@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0

- name: Save logs
if: always()
uses: defenseunicorns/uds-common/.github/actions/save-logs@a7549ad75a9bbd8e71ce2236ec17c1e33ec4df61 # v0.8.1
uses: defenseunicorns/uds-common/.github/actions/save-logs@91515ef86914334356c35ffb4b2c2c5fb4d19174 # v0.9.0
with:
suffix: ${{ matrix.type }}-${{ matrix.bundle }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Alternatively, you can deploy from OCI by running the following two commands:

1. Run the below command to deploy the `k3d-core-slim-dev` bundle:

> [!NOTE]: You can append `--set INSECURE_ADMIN_PASSWORD_GENERATION=true` to the below command to enable a default keycloak admin. This is useful for development and testing of the SWF stack and enables the ability to run `uds run setup:create-doug-user` to create a user to test with using the username `doug` and the password `unicorn123!@#`.
> [!NOTE]: You can append `--set INSECURE_ADMIN_PASSWORD_GENERATION=true` to the below command to enable a default keycloak admin. This is useful for development and testing of the SWF stack and enables the ability to run `uds run setup:create-doug-user` to create a user to test with using the username `doug` and the password `unicorn123!@#UN`.

```bash
uds deploy k3d-core-slim-dev:0.24.1
Expand Down
6 changes: 3 additions & 3 deletions bundles/dev/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ packages:

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 17.1.2-uds.0-upstream
ref: 17.1.2-uds.1-upstream
overrides:
gitlab:
uds-gitlab-config:
Expand Down Expand Up @@ -212,7 +212,7 @@ packages:

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 17.0.0-uds.1-upstream
ref: 17.1.0-uds.0-upstream

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
Expand Down Expand Up @@ -240,7 +240,7 @@ packages:

- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.9.1-uds.0-upstream
ref: 9.10.1-uds.0-upstream
imports:
- name: ACCESS_KEY
package: dev-secrets
Expand Down
6 changes: 3 additions & 3 deletions bundles/k3d-demo/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ packages:

- name: gitlab
repository: ghcr.io/defenseunicorns/packages/uds/gitlab
ref: 17.1.2-uds.0-upstream
ref: 17.1.2-uds.1-upstream
overrides:
gitlab:
uds-gitlab-config:
Expand Down Expand Up @@ -231,7 +231,7 @@ packages:

- name: gitlab-runner
repository: ghcr.io/defenseunicorns/packages/uds/gitlab-runner
ref: 17.0.0-uds.1-upstream
ref: 17.1.0-uds.0-upstream

- name: sonarqube
repository: ghcr.io/defenseunicorns/packages/uds/sonarqube
Expand Down Expand Up @@ -259,7 +259,7 @@ packages:

- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.9.1-uds.0-upstream
ref: 9.10.1-uds.0-upstream
imports:
- name: ACCESS_KEY
package: dev-secrets
Expand Down
10 changes: 5 additions & 5 deletions tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
includes:
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/create.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/setup.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/create.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/setup.yaml
- dependencies: ./tasks/dependencies.yaml
- test: ./tasks/test.yaml

Expand Down
8 changes: 4 additions & 4 deletions tasks/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
includes:
- dependencies: ./dependencies.yaml
- test: ./tasks/test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/publish.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/setup.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.8.1/tasks/deploy.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/publish.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/setup.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.9.0/tasks/deploy.yaml

tasks:
- name: build-bundle
Expand Down
6 changes: 3 additions & 3 deletions tasks/test.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
includes:
- mm: https://raw.githubusercontent.com/defenseunicorns/uds-package-mattermost/v9.9.1-uds.0/tasks/test.yaml
- gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v17.1.2-uds.0/tasks/test.yaml
- mm: https://raw.githubusercontent.com/defenseunicorns/uds-package-mattermost/v9.10.1-uds.0/tasks/test.yaml
- gl: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab/v17.1.2-uds.1/tasks/test.yaml
- sq: https://raw.githubusercontent.com/defenseunicorns/uds-package-sonarqube/v9.9.5-uds.1/tasks/test.yaml
- glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v17.0.0-uds.1/tasks/test.yaml
- glr: https://raw.githubusercontent.com/defenseunicorns/uds-package-gitlab-runner/v17.1.0-uds.0/tasks/test.yaml

tasks:
- name: test-swf-bundle
Expand Down