diff --git a/.github/workflows/tag-and-release.yaml b/.github/workflows/tag-and-release.yaml index 493ab279..67c86b8d 100644 --- a/.github/workflows/tag-and-release.yaml +++ b/.github/workflows/tag-and-release.yaml @@ -31,7 +31,7 @@ jobs: permissions: contents: read packages: write - + steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -40,13 +40,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@343f7c4344506bcbf9b4de18042ae17996df046d # 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 cbfabb28..720d64f8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,7 +35,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 @@ -44,7 +44,7 @@ jobs: - name: Setup cluster run: uds run setup-cluster - + - name: Deploy test bundle run: uds run deploy-test-bundle diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0f22b9a3..21a77a36 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - id: check-yaml exclude: | (?x)^( - charts/raw/templates/resources.yaml + chart/templates/.*.yaml )$ args: - "--allow-multiple-documents" @@ -40,7 +40,8 @@ repos: args: [ "--schemafile", - "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.29.1/zarf.schema.json", + # renovate: repo-file depName=defenseunicorns/zarf versioning=semver + "https://raw.githubusercontent.com/defenseunicorns/zarf/v0.32.2/zarf.schema.json", "--no-cache" ] - repo: https://github.com/golangci/golangci-lint diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 88cde2d7..7740b227 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -10,11 +10,11 @@ packages: - name: dev-minio repository: ghcr.io/defenseunicorns/packages/uds/dev-minio ref: 0.0.1 - + - name: dev-postgres repository: ghcr.io/defenseunicorns/packages/uds/dev-postgres ref: 0.0.1 - + - name: dev-secrets path: ../ ref: 0.1.0 diff --git a/commitlint.config.js b/commitlint.config.js index 8567d51d..5073c20d 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1 +1 @@ -module.exports = { extends: ["@commitlint/config-conventional"] }; \ No newline at end of file +module.exports = { extends: ["@commitlint/config-conventional"] }; diff --git a/docs/DEVELOPMENT_MAINTENANCE.md b/docs/DEVELOPMENT_MAINTENANCE.md index 5ca5f51c..39663d5b 100644 --- a/docs/DEVELOPMENT_MAINTENANCE.md +++ b/docs/DEVELOPMENT_MAINTENANCE.md @@ -59,4 +59,4 @@ When changes are merged to the `main` branch, the Release Please will evaluate a When the auto generated Release Please PR is merged the following steps will automatically happen. 1) A new release will be created and tagged 1) An e2e test will be triggered -1) If e2e passes, a new package artifact will be published to the OCI registry \ No newline at end of file +1) If e2e passes, a new package artifact will be published to the OCI registry diff --git a/oscal-component.yaml b/oscal-component.yaml index 2ffbdbba..36af65ac 100644 --- a/oscal-component.yaml +++ b/oscal-component.yaml @@ -31,15 +31,15 @@ component-definition: - uuid: 889dce9c-d83f-48a3-a62a-3f50e311761a control-id: au-2 description: >- - Mattermost creates event logs. + Mattermost creates event logs. - uuid: ce2c791e-f47e-45d3-9bba-dcd7a372ddd3 control-id: au-3 description: >- - Mattermost creates event logs. + Mattermost creates event logs. - uuid: 2ef78f64-d9ac-4292-a5f1-6c627734d39c control-id: au-3.1 description: >- - Mattermost creates event logs. + Mattermost creates event logs. - uuid: 1041d516-56b9-4652-886e-bd5bad38f789 control-id: au-8 description: >- diff --git a/release-please-config.json b/release-please-config.json index f6ba8517..1064e8fe 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -21,4 +21,4 @@ } }, "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" -} \ No newline at end of file +} diff --git a/renovate.json b/renovate.json index bcf3eda9..5c58d729 100644 --- a/renovate.json +++ b/renovate.json @@ -58,6 +58,14 @@ ], "datasourceTemplate": "github-tags" }, + { + "fileMatch": [".*\\.ya?ml$"], + "matchStrings": [ + "# renovate: repo-file depName=(?.*?)( versioning=(?.*?))?\\n.*\\/(?v.*?)\\/" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", + "datasourceTemplate": "github-tags" + }, { "depNameTemplate": "defenseunicorns/uds-common-tasks", "fileMatch": ["\\.*\\.ya?ml$"], diff --git a/tasks.yaml b/tasks.yaml index 4b739b5e..18e2eae1 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -15,7 +15,7 @@ tasks: - name: setup-cluster actions: - task: setup:k3d-test-cluster - + - name: create-package actions: - task: create:mattermost-package @@ -23,7 +23,7 @@ tasks: - name: create-test-bundle actions: - task: create:mattermost-test-bundle - + - name: deploy-package actions: - task: deploy:package