Skip to content

Commit 5a581ca

Browse files
Racer159Racer159
committed
chore: update to uds-common v0.3.9 and add upgrade-tests
1 parent ed7206b commit 5a581ca

File tree

13 files changed

+211
-203
lines changed

13 files changed

+211
-203
lines changed

‎.github/workflows/ci-docs-shim.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: CI Docs Shim
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
types: [milestoned, opened, synchronize]
7+
8+
jobs:
9+
run-test:
10+
name: ${{ matrix.type }} ${{ matrix.flavor }}
11+
runs-on: "ubuntu-latest"
12+
timeout-minutes: 20
13+
strategy:
14+
matrix:
15+
flavor: [upstream, registry1]
16+
type: [install, upgrade]
17+
steps:
18+
- name: Shim for ${{ matrix.type }} ${{ matrix.flavor }}
19+
run: |
20+
echo "Documentation-only change detected; marking ${{ matrix.type }} ${{ matrix.flavor }} as successful."

‎.github/workflows/commitlint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ on:
88
jobs:
99
validate:
1010
name: Validate
11-
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@417b9c2bc088f664c616c9929a2b3ce448d251f7
11+
uses: defenseunicorns/uds-common/.github/workflows/commitlint.yaml@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9

‎.github/workflows/lint.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Scan
2+
3+
on:
4+
# This workflow is triggered on pull requests to the main branch.
5+
pull_request:
6+
branches: [main]
7+
types: [milestoned, opened, synchronize]
8+
9+
jobs:
10+
validate:
11+
runs-on: ubuntu-latest
12+
name: Lint
13+
permissions:
14+
contents: read # Allows reading the repo contents
15+
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Environment setup
23+
uses: defenseunicorns/uds-common/.github/actions/setup@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9
24+
with:
25+
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
26+
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
27+
ghToken: ${{ secrets.GITHUB_TOKEN }}
28+
29+
- name: Install lint deps
30+
run: |
31+
uds run lint:deps
32+
33+
- name: Lint the repository
34+
run: |
35+
uds run lint:yaml

‎.github/workflows/pull-requests.yaml‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎.github/workflows/tag-and-release.yaml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches:
66
- main
77

8+
permissions:
9+
contents: read
10+
packages: write
11+
812
jobs:
913
tag-new-version:
1014
name: Tag New Version
@@ -15,18 +19,18 @@ jobs:
1519
steps:
1620
- name: Create release tag
1721
id: tag
18-
uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e # v4
22+
uses: google-github-actions/release-please-action@a37ac6e4f6449ce8b3f7607e4d97d0146028dc0b # v4.1.0
1923
- id: release-flag
2024
run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> $GITHUB_OUTPUT
2125

2226
publish-package:
23-
strategy:
24-
matrix:
25-
flavor: [upstream, registry1]
2627
needs: tag-new-version
2728
if: ${{ needs.tag-new-version.outputs.release_created == 'true' }}
2829
runs-on: ubuntu-latest
29-
name: Publish package
30+
name: Publish ${{ matrix.flavor }}
31+
strategy:
32+
matrix:
33+
flavor: [upstream, registry1]
3034

3135
permissions:
3236
contents: read
@@ -36,23 +40,17 @@ jobs:
3640
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3741

3842
- name: Environment setup
39-
uses: defenseunicorns/uds-common/.github/actions/setup@417b9c2bc088f664c616c9929a2b3ce448d251f7
40-
41-
- name: Iron Bank Login
42-
run: uds zarf tools registry login -u "${{secrets.IRON_BANK_ROBOT_USERNAME}}" -p "${{secrets.IRON_BANK_ROBOT_PASSWORD}}" registry1.dso.mil
43-
44-
- name: Login to GHCR
45-
uses: docker/login-action@v3
43+
uses: defenseunicorns/uds-common/.github/actions/setup@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9
4644
with:
47-
registry: ghcr.io
48-
username: dummy
49-
password: ${{ secrets.GITHUB_TOKEN }}
45+
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
46+
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
47+
ghToken: ${{ secrets.GITHUB_TOKEN }}
5048

5149
- name: Publish Package
5250
run: uds run -f tasks/publish.yaml package --set FLAVOR=${{ matrix.flavor }}
5351

5452
- name: Save logs
5553
if: always()
56-
uses: defenseunicorns/uds-common/.github/actions/save-logs@417b9c2bc088f664c616c9929a2b3ce448d251f7
54+
uses: defenseunicorns/uds-common/.github/actions/save-logs@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9
5755
with:
58-
suffix: '${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}'
56+
suffix: ${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}

‎.github/workflows/test.yaml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Test
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
types: [milestoned, opened, synchronize]
7+
paths-ignore:
8+
- "**.md"
9+
- "**.jpg"
10+
- "**.png"
11+
- "**.gif"
12+
- "**.svg"
13+
- "adr/**"
14+
- "docs/**"
15+
- ".gitignore"
16+
- "renovate.json"
17+
- ".release-please-config.json"
18+
- "release-please-config.json"
19+
- "oscal-component.yaml"
20+
- "CODEOWNERS"
21+
- "LICENSE"
22+
- "CONTRIBUTING.md"
23+
- "SECURITY.md"
24+
25+
26+
# Abort prior jobs in the same workflow / PR
27+
concurrency:
28+
group: test-${{ github.ref }}-${{ inputs.package }}
29+
cancel-in-progress: true
30+
31+
permissions:
32+
contents: read
33+
34+
jobs:
35+
test:
36+
name: ${{ matrix.type }} ${{ matrix.flavor }}
37+
runs-on: "uds-ubuntu-big-boy-8-core"
38+
strategy:
39+
matrix:
40+
flavor: [upstream, registry1]
41+
type: [install, upgrade]
42+
43+
steps:
44+
- name: Checkout repository
45+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
46+
47+
- name: Environment setup
48+
uses: defenseunicorns/uds-common/.github/actions/setup@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9
49+
with:
50+
registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
51+
registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
52+
ghToken: ${{ secrets.GITHUB_TOKEN }}
53+
54+
- name: Test
55+
uses: defenseunicorns/uds-common/.github/actions/test@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9
56+
with:
57+
flavor: ${{ matrix.flavor }}
58+
type: ${{ matrix.type }}
59+
60+
- name: Save logs
61+
if: always()
62+
uses: defenseunicorns/uds-common/.github/actions/save-logs@264ec430c4079129870820e70c4439f3f3d57cbc # v0.3.9
63+
with:
64+
suffix: ${{ matrix.type }}-${{ matrix.flavor }}-${{ github.run_id }}-${{ github.run_attempt }}

‎renovate.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
":semanticCommits",
88
":semanticCommitTypeAll(chore)"
99
],
10-
"branchConcurrentLimit": 0,
11-
"prConcurrentLimit": 0,
12-
"prHourlyLimit": 0,
13-
"separateMajorMinor": false,
14-
"regexManagers":[
15-
],
1610
"packageRules": [
17-
{
18-
"matchFileNames": [".github/**"],
19-
"excludePackageNames": ["defenseunicorns/uds-cli"],
20-
"groupName": "githubactions",
21-
"commitMessageTopic": "githubactions",
22-
"pinDigests": true
11+
{
12+
"groupName": "Postgres Support Dependencies",
13+
"labels": ["support-deps"],
14+
"commitMessageTopic": "support-deps",
15+
"packagePatterns": ["*"]
16+
},
17+
{
18+
"groupName": "Postgres Package Dependencies",
19+
"labels": ["package-deps"],
20+
"commitMessageTopic": "package-deps",
21+
"registryUrls": ["https://registry1.dso.mil"],
22+
"matchDatasources": ["docker", "helm", "git-tags"]
2323
}
2424
]
2525
}

0 commit comments

Comments
 (0)