-
Notifications
You must be signed in to change notification settings - Fork 3
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 go-reserved-words
- Loading branch information
Showing
7 changed files
with
80 additions
and
66 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,89 @@ | ||
| { | ||
| constraints: { | ||
| "go": "1.19" | ||
| go: '1.21', | ||
| }, | ||
| extends: [ | ||
| "config:base" | ||
| 'config:recommended', | ||
| 'default:pinDigestsDisabled', | ||
| ], | ||
| configMigration: true, | ||
| enabledManagers: [ | ||
| "regex", | ||
| "github-actions", | ||
| "gomod" | ||
| 'custom.regex', | ||
| 'github-actions', | ||
| 'gomod', | ||
| ], | ||
| postUpdateOptions: [ | ||
| "gomodTidy" | ||
| 'gomodTidy', | ||
| ], | ||
| regexManagers: [ | ||
| customManagers: [ | ||
| { | ||
| fileMatch: [ | ||
| ".github/renovate.json5$", | ||
| "Earthfile$" | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| '.github/renovate.json5$', | ||
| 'Earthfile$', | ||
| ], | ||
| matchStrings: [ | ||
| "GO_VERSION=(?<currentValue>.*?)\\n", | ||
| "constraints: {(\\s*\\n\\s*)\"go\":\\s*\"(?<currentValue>.*?)\"", | ||
| "ARG go_version=(?<currentValue>.*?)\\n" | ||
| 'GO_VERSION=(?<currentValue>.*?)\\n', | ||
| 'constraints: {(\\s*\\n\\s*)"go":\\s*"(?<currentValue>.*?)"', | ||
| 'ARG go_version=(?<currentValue>.*?)\\n', | ||
| ], | ||
| depNameTemplate: "go", | ||
| datasourceTemplate: "golang-version", | ||
| versioningTemplate: "npm", | ||
| depNameTemplate: 'go', | ||
| datasourceTemplate: 'golang-version', | ||
| versioningTemplate: 'npm', | ||
| }, | ||
| { | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| "Earthfile$" | ||
| 'Earthfile$', | ||
| ], | ||
| matchStrings: [ | ||
| "ARG ALPINE_VERSION=(?<currentValue>.*?)\\n" | ||
| 'ARG ALPINE_VERSION=(?<currentValue>.*?)\\n', | ||
| ], | ||
| depNameTemplate: "alpine", | ||
| datasourceTemplate: "docker" | ||
| depNameTemplate: 'alpine', | ||
| datasourceTemplate: 'docker', | ||
| }, | ||
| { | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| "Earthfile$" | ||
| 'Earthfile$', | ||
| ], | ||
| matchStrings: [ | ||
| "ARG LINTER_VERSION=(?<currentValue>.*?)\\n" | ||
| 'ARG LINTER_VERSION=(?<currentValue>.*?)\\n', | ||
| ], | ||
| depNameTemplate: "golangci/golangci-lint", | ||
| datasourceTemplate: "github-releases" | ||
| depNameTemplate: 'golangci/golangci-lint', | ||
| datasourceTemplate: 'github-releases', | ||
| }, | ||
| { | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| "Earthfile$" | ||
| 'Earthfile$', | ||
| ], | ||
| matchStrings: [ | ||
| "ARG DOCKER_PROTOC_VERSION=(?<currentValue>.*?)\\n" | ||
| 'ARG DOCKER_PROTOC_VERSION=(?<currentValue>.*?)\\n', | ||
| ], | ||
| depNameTemplate: "namely/protoc-all", | ||
| datasourceTemplate: "docker", | ||
| versioningTemplate: "regex:^(?<major>\\d+)\\.(?<minor>\\d+)_(?<patch>\\d+)$" | ||
| depNameTemplate: 'namely/protoc-all', | ||
| datasourceTemplate: 'docker', | ||
| versioningTemplate: 'regex:^(?<major>\\d+)\\.(?<minor>\\d+)_(?<patch>\\d+)$', | ||
| }, | ||
| { | ||
| customType: 'regex', | ||
| fileMatch: [ | ||
| ".github/workflows/ci.yml$", | ||
| ".github/workflows/release.yml$" | ||
| '.github/workflows/ci.yml$', | ||
| '.github/workflows/release.yml$', | ||
| ], | ||
| matchStrings: [ | ||
| "version: (?<currentValue>.*?)\\n" | ||
| 'version: (?<currentValue>.*?)\\n', | ||
| ], | ||
| depNameTemplate: "earthly/earthly", | ||
| datasourceTemplate: "github-releases" | ||
| } | ||
| depNameTemplate: 'earthly/earthly', | ||
| datasourceTemplate: 'github-releases', | ||
| }, | ||
| ], | ||
| packageRules: [ | ||
| { | ||
| matchDatasources: ["go"], | ||
| groupName: "go modulesUpgrades" | ||
| } | ||
| ] | ||
| matchDatasources: [ | ||
| 'go', | ||
| ], | ||
| groupName: 'go modulesUpgrades', | ||
| }, | ||
| ], | ||
| } |
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,15 +12,15 @@ jobs: | |
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - uses: nelonoel/[email protected] | ||
|
|
||
| - uses: earthly/actions/setup-earthly@v1 | ||
| - uses: earthly/actions/setup-earthly@main | ||
| with: | ||
| version: v0.6.24 | ||
| version: v0.7.22 | ||
|
|
||
| - name: Earthly Version | ||
| run: earthly --version | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -9,15 +9,15 @@ jobs: | |
| release-build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - uses: nelonoel/[email protected] | ||
|
|
||
| - uses: earthly/actions/setup-earthly@v1 | ||
| with: | ||
| version: v0.6.24 | ||
| version: v0.7.22 | ||
|
|
||
| - name: Earthly Version | ||
| run: earthly --version | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| module github.com/idodod/protoc-gen-fieldmask | ||
|
|
||
| go 1.19 | ||
| go 1.21 | ||
|
|
||
| require ( | ||
| github.com/iancoleman/strcase v0.2.0 | ||
| github.com/stretchr/testify v1.8.0 | ||
| google.golang.org/protobuf v1.28.1 | ||
| github.com/stretchr/testify v1.8.4 | ||
| google.golang.org/protobuf v1.30.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/google/go-cmp v0.5.6 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| github.com/stretchr/objx v0.5.0 // indirect | ||
| golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | ||
| google.golang.org/genproto v0.0.0-20220902135211-223410557253 // indirect | ||
| google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
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