-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into lock-repo-on-apply
- Loading branch information
Showing
177 changed files
with
4,720 additions
and
4,328 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| root = true | ||
|
|
||
| [*] | ||
| charset = utf-8 | ||
| end_of_line = lf | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
|
|
||
| [*.md] | ||
| indent_style = space | ||
| indent_size = 3 | ||
| trim_trailing_whitespace = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,116 @@ | ||
| { | ||
| extends: [ | ||
| "config:base", | ||
| "schedule:daily", | ||
| 'config:best-practices', | ||
| ':separateMultipleMajorReleases', | ||
| 'schedule:daily', | ||
| ], | ||
| commitMessageSuffix: " in {{packageFile}}", | ||
| commitMessageSuffix: ' in {{packageFile}}', | ||
| dependencyDashboardAutoclose: true, | ||
| automerge: true, | ||
| baseBranches: ["main", "/^release\-.*/"], | ||
| baseBranches: [ | ||
| 'main', | ||
| '/^release-.*/', | ||
| ], | ||
| platformAutomerge: true, | ||
| labels: ["dependencies"], | ||
| labels: [ | ||
| 'dependencies', | ||
| ], | ||
| postUpdateOptions: [ | ||
| "gomodTidy", | ||
| "gomodUpdateImportPaths", | ||
| "pnpmDedupe", | ||
| 'gomodTidy', | ||
| 'gomodUpdateImportPaths', | ||
| 'pnpmDedupe', | ||
| ], | ||
| // needed so e2e tests do not stomp over each other | ||
| prHourlyLimit: 1, | ||
| lockFileMaintenance: { | ||
| enabled: true, | ||
| }, | ||
| osvVulnerabilityAlerts: true, | ||
| vulnerabilityAlerts: { | ||
| enabled: true, | ||
| labels: [ | ||
| "security", | ||
| 'security', | ||
| ], | ||
| }, | ||
| packageRules: [ | ||
| // For vuepress | ||
| { | ||
| "matchPackageNames": ["vuepress", "@vuepress/client", "@vuepress/markdown", "@vuepress/utils"], | ||
| "groupName": "vuepress", | ||
| "allowedVersions": "!/pre.*$/", | ||
| "matchFileNames": ["package.json"], | ||
| "enabled": false | ||
| }, | ||
| // e2e test depends on testing/Dockefile testing-image which has conftest specific version. | ||
| // to upgrade conftest versions, we need following PRs. | ||
| // 1. update testing/Dockerfile conftest version | ||
| // 2. update testing-env tag | ||
| // 3. update e2e conftest version | ||
| // This will allow conftest version updates in testing/Dockefile | ||
| { | ||
| matchPaths: ["testing/**"], | ||
| matchPackagePatterns: ["conftest"], | ||
| additionalBranchPrefix: "{{baseDir}}-", | ||
| groupName: "conftest-testing", | ||
| /* | ||
| prBodyNotes: [ | ||
| ":warning: Upgrade testing-env conftest and then upgrade other conftest versions for e2e :warning:", | ||
| matchFileNames: [ | ||
| 'testing/**', | ||
| ], | ||
| matchPackagePatterns: [ | ||
| 'conftest', | ||
| ], | ||
| */ | ||
| additionalBranchPrefix: '{{packageFileDir}}-', | ||
| groupName: 'conftest-testing', | ||
| }, | ||
| { | ||
| ignorePaths: ["testing/**"], | ||
| matchPackagePatterns: ["github-actions"], | ||
| groupName: "github-", | ||
| ignorePaths: [ | ||
| 'testing/**', | ||
| ], | ||
| matchPackagePatterns: [ | ||
| 'github-actions', | ||
| ], | ||
| groupName: 'github-', | ||
| }, | ||
| /* | ||
| // This tag is currently latest so we can skip this check for now unless we need to pin it again. | ||
| { | ||
| // we need to upgrade testing-env on ci quickly | ||
| matchPackageNames: ["ghcr.io/runatlantis/testing-env"], | ||
| groupName: "testing-env-ci-test", | ||
| schedule: ["every 1 hour after 00:00 and before 23:59 every day"], | ||
| matchDatasources: [ | ||
| 'docker', | ||
| ], | ||
| matchPackageNames: [ | ||
| 'node', | ||
| 'cimg/node', | ||
| ], | ||
| versioning: 'node', | ||
| }, | ||
| */ | ||
| { | ||
| // use LTS node version for node docker image | ||
| matchDatasources: ["docker"], | ||
| matchPackageNames: ["node", "cimg/node"], | ||
| versioning: "node", | ||
| matchPackageNames: [ | ||
| 'go', | ||
| 'golang', | ||
| ], | ||
| versioning: 'go', | ||
| groupName: 'go' | ||
| }, | ||
| ], | ||
| // https://docs.renovatebot.com/modules/manager/regex/ | ||
| regexManagers: [ | ||
| customManagers: [ | ||
| { | ||
| fileMatch: ["(^|/)Dockerfile$", "(^|/)Dockerfile\\.[^/]*$"], | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| '(^|/)Dockerfile$', | ||
| '(^|/)Dockerfile\\.[^/]*$', | ||
| ], | ||
| matchStrings: [ | ||
| // example: | ||
| // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp | ||
| // # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp | ||
| // ENV DEFAULT_TERRAFORM_VERSION=x.x.x | ||
| "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sENV .*?_VERSION=(?<currentValue>.*)\\s", | ||
| // # renovate: datasource=github-releases depName=open-policy-agent/conftest | ||
| // ARG DEFAULT_CONFTEST_VERSION=x.x.x | ||
| "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s(ARG|ENV) .*?_VERSION=(?<currentValue>.*)\\s", | ||
| ], | ||
| versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}", | ||
| versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}', | ||
| extractVersionTemplate: '^v(?<version>\\d+\\.\\d+\\.\\d+)', | ||
| }, | ||
| { | ||
| fileMatch: [".*go$"], | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| '.*go$', | ||
| ], | ||
| matchStrings: [ | ||
| // example: | ||
| // const ConftestVersion = "x.x.x" // renovate: datasource=github-releases depName=open-policy-agent/conftest | ||
| "\\sconst .*Version = \"(?<currentValue>.*)\"\\s// renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s", | ||
| '\\sconst .*Version = "(?<currentValue>.*)"\\s// renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s', | ||
| ], | ||
| versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}", | ||
| versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}', | ||
| extractVersionTemplate: '^v(?<version>\\d+\\.\\d+\\.\\d+)', | ||
| }, | ||
| { | ||
| fileMatch: [".circleci/config.yml$"], | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| '.circleci/config.yml$', | ||
| '^\\.github/workflows/[^/]+\\.ya?ml$', | ||
| ], | ||
| matchStrings: [ | ||
| // example: | ||
| // # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp | ||
| // TRRAFORM_VERSION: x.x.x | ||
| "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION: (?<currentValue>.*)\\s", | ||
| 'renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION: (?<currentValue>.*)\\s', | ||
| ], | ||
| versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}", | ||
| versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}', | ||
| extractVersionTemplate: '^v(?<version>\\d+\\.\\d+\\.\\d+)', | ||
| }, | ||
| ] | ||
| ], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,11 @@ on: | |
| branches: | ||
| - 'main' | ||
| - 'release-**' | ||
| types: | ||
| - opened | ||
| - reopened | ||
| - synchronize | ||
| - ready_for_review | ||
| workflow_dispatch: | ||
|
|
||
| concurrency: | ||
|
|
@@ -25,8 +30,8 @@ jobs: | |
| if: github.event.pull_request.draft == false | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: dorny/paths-filter@v3 | ||
| - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 | ||
| - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3 | ||
| id: changes | ||
| with: | ||
| filters: | | ||
|
|
@@ -52,22 +57,22 @@ jobs: | |
| PUSH: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 | ||
|
|
||
| # Lint the Dockerfile first before setting anything up | ||
| - name: Lint Dockerfile | ||
| uses: hadolint/[email protected] | ||
| uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf # v3.1.0 | ||
| with: | ||
| dockerfile: "Dockerfile" | ||
|
|
||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v3 | ||
| uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3 | ||
| with: | ||
| image: tonistiigi/binfmt:latest | ||
| platforms: arm64,arm | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
| uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3 | ||
| # https://github.com/docker/build-push-action/issues/761#issuecomment-1575006515 | ||
| with: | ||
| driver-opts: | | ||
|
|
@@ -81,7 +86,7 @@ jobs: | |
| # if it's v0.10.0 and debian, it will do v0.10.0-debian, latest-debian | ||
| - name: Docker meta | ||
| id: meta | ||
| uses: docker/metadata-action@v5 | ||
| uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5 | ||
| env: | ||
| SUFFIX: ${{ format('-{0}', matrix.image_type) }} | ||
| with: | ||
|
|
@@ -113,7 +118,7 @@ jobs: | |
| # Suffix is not used here since there's no way to disable it above | ||
| - name: Login to Packages Container registry | ||
| uses: docker/login-action@v3 | ||
| uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.actor }} | ||
|
|
@@ -126,7 +131,7 @@ jobs: | |
|
|
||
| - name: "Build ${{ env.PUSH == 'true' && 'and push' || '' }} ${{ env.DOCKER_REPO }} image" | ||
| if: contains(fromJson('["push", "pull_request"]'), github.event_name) | ||
| uses: docker/build-push-action@v5 | ||
| uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5 | ||
| with: | ||
| cache-from: type=gha | ||
| cache-to: type=gha,mode=max | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.