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: lint #21

Closed
wants to merge 2 commits into from
Closed
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
6 changes: 3 additions & 3 deletions .github/workflows/tag-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

Expand All @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -44,7 +44,7 @@ jobs:

- name: Setup cluster
run: uds run setup-cluster

- name: Deploy test bundle
run: uds run deploy-test-bundle

Expand Down
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
- id: check-yaml
exclude: |
(?x)^(
charts/raw/templates/resources.yaml
chart/templates/.*.yaml
)$
args:
- "--allow-multiple-documents"
Expand All @@ -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",
corang marked this conversation as resolved.
Show resolved Hide resolved
"--no-cache"
]
- repo: https://github.com/golangci/golangci-lint
Expand Down
4 changes: 2 additions & 2 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = { extends: ["@commitlint/config-conventional"] };
module.exports = { extends: ["@commitlint/config-conventional"] };
2 changes: 1 addition & 1 deletion docs/DEVELOPMENT_MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
1) If e2e passes, a new package artifact will be published to the OCI registry
6 changes: 3 additions & 3 deletions oscal-component.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down
2 changes: 1 addition & 1 deletion release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
}
},
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
}
}
8 changes: 8 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@
],
"datasourceTemplate": "github-tags"
},
{
"fileMatch": [".*\\.ya?ml$"],
"matchStrings": [
"# renovate: repo-file depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\n.*\\/(?<currentValue>v.*?)\\/"
],
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}",
"datasourceTemplate": "github-tags"
},
Comment on lines +61 to +68
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend we don't do this. This is going to be very messy long term and instead we should pick a single renovate comment format.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of #20 this repo now uses this renovate configuration: https://github.com/defenseunicorns/uds-common/blob/main/config/renovate.json5

This common rule will match this dependency without needing a # renovate comment at all: https://github.com/defenseunicorns/uds-common/blob/main/config/renovate.json5#L30

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{
"depNameTemplate": "defenseunicorns/uds-common-tasks",
"fileMatch": ["\\.*\\.ya?ml$"],
Expand Down
4 changes: 2 additions & 2 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ tasks:
- name: setup-cluster
actions:
- task: setup:k3d-test-cluster

- name: create-package
actions:
- task: create:mattermost-package

- name: create-test-bundle
actions:
- task: create:mattermost-test-bundle

- name: deploy-package
actions:
- task: deploy:package
Expand Down
Loading