From fcb3112de2702252d4ada9d0f5f35d04e8b245a9 Mon Sep 17 00:00:00 2001 From: Erhan Cagirici Date: Wed, 13 Nov 2024 20:45:16 +0300 Subject: [PATCH 1/4] switch build submodule to crossplane/build repo Signed-off-by: Erhan Cagirici --- .gitmodules | 2 +- build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bbd089e3..48a2bc94 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,4 @@ [submodule "build"] path = build -url = https://github.com/upbound/build + url = https://github.com/crossplane/build diff --git a/build b/build index bd5297bd..cc14f9cd 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit bd5297bd16c113cbc5ed1905b1d96aa1cb3078ec +Subproject commit cc14f9cdac034e0eaaeb43479f57ee85d5490473 From 57535ad9fa27a9375457b6192c4de9b96f611df5 Mon Sep 17 00:00:00 2001 From: Erhan Cagirici Date: Wed, 13 Nov 2024 20:46:47 +0300 Subject: [PATCH 2/4] update linter config & remove deprecations Signed-off-by: Erhan Cagirici --- .golangci.yml | 56 +++++++------------- Makefile | 4 +- pkg/controller/external_async_tfpluginfw.go | 6 +-- pkg/controller/external_async_tfpluginsdk.go | 6 +-- pkg/terraform/files.go | 2 +- pkg/types/conversion/tfjson/tfjson.go | 6 +-- 6 files changed, 31 insertions(+), 49 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fb24e160..bdd4c59a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,12 +5,12 @@ run: timeout: 10m - skip-files: - - "zz_generated\\..+\\.go$" - output: # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number" - format: colored-line-number + formats: + - format: colored-line-number + print-linter-name: true + show-stats: true linters-settings: errcheck: @@ -22,10 +22,10 @@ linters-settings: # default is false: such cases aren't reported by default. check-blank: false - # [deprecated] comma-separated list of pairs of the form pkg:regex - # the regex is used to ignore names within pkg. (default "fmt:.*"). - # see https://github.com/kisielk/errcheck#the-deprecated-method for details - ignore: fmt:.*,io/ioutil:^Read.* + exclude-functions: + - io/ioutil.ReadFile + - io/ioutil.ReadDir + - io/ioutil.ReadAll govet: # report about shadowed variables @@ -52,10 +52,6 @@ linters-settings: # minimal code complexity to report, 30 by default (but we recommend 10-20) min-complexity: 10 - maligned: - # print struct with more effective memory layout or not, false by default - suggest-new: true - dupl: # tokens count to trigger issue, 150 by default threshold: 100 @@ -70,13 +66,6 @@ linters-settings: # tab width in spaces. Default to 1. tab-width: 1 - unused: - # treat code as a program (not a library) and report unused exported identifiers; default is false. - # XXX: if you enable this setting, unused will report a lot of false-positives in text editors: - # if it's called for subdir of a project it can't find funcs usages. All text editor integrations - # with golangci-lint call it on a directory with the changed file. - check-exported: false - unparam: # Inspect exported functions, default is false. Set to true if no external program/library imports your code. # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors: @@ -116,29 +105,22 @@ linters-settings: linters: enable: - - megacheck - govet - gocyclo - gocritic - goconst - gci - gofmt # We enable this as well as goimports for its simplify mode. + - gosimple - prealloc - revive + - staticcheck - unconvert + - unused - misspell - nakedret - nolintlint - disable: - # These linters are all deprecated as of golangci-lint v1.49.0. We disable - # them explicitly to avoid the linter logging deprecation warnings. - - deadcode - - varcheck - - scopelint - - structcheck - - interfacer - presets: - bugs - unused @@ -168,31 +150,31 @@ issues: # rather than using a pointer. - text: "(hugeParam|rangeValCopy):" linters: - - gocritic + - gocritic # This "TestMain should call os.Exit to set exit code" warning is not clever # enough to notice that we call a helper method that calls os.Exit. - text: "SA3000:" linters: - - staticcheck + - staticcheck - text: "k8s.io/api/core/v1" linters: - - goimports + - goimports # This is a "potential hardcoded credentials" warning. It's triggered by # any variable with 'secret' in the same, and thus hits a lot of false # positives in Kubernetes land where a Secret is an object type. - text: "G101:" linters: - - gosec - - gas + - gosec + - gas # This is an 'errors unhandled' warning that duplicates errcheck. - text: "G104:" linters: - - gosec - - gas + - gosec + - gas # Some k8s dependencies do not have JSON tags on all fields in structs. - path: k8s.io/ @@ -214,7 +196,7 @@ issues: new: false # Maximum issues count per one linter. Set to 0 to disable. Default is 50. - max-per-linter: 0 + max-issues-per-linter: 0 # Maximum count of issues with the same text. Set to 0 to disable. Default is 3. max-same-issues: 0 diff --git a/Makefile b/Makefile index d1e3ffad..241a20c4 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME) # GOLANGCILINT_VERSION is inherited from build submodule by default. # Uncomment below if you need to override the version. -GOLANGCILINT_VERSION ?= 1.55.2 -GO_REQUIRED_VERSION ?= 1.21 +# GOLANGCILINT_VERSION ?= 1.61.0 +# GO_REQUIRED_VERSION ?= 1.22 PLATFORMS ?= linux_amd64 linux_arm64 # -include will silently skip missing files, which allows us diff --git a/pkg/controller/external_async_tfpluginfw.go b/pkg/controller/external_async_tfpluginfw.go index 1dc47336..0b1dbc5b 100644 --- a/pkg/controller/external_async_tfpluginfw.go +++ b/pkg/controller/external_async_tfpluginfw.go @@ -158,7 +158,7 @@ func (ph *panicHandler) recoverIfPanic() { } } -func (n *terraformPluginFrameworkAsyncExternalClient) Create(_ context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) { +func (n *terraformPluginFrameworkAsyncExternalClient) Create(_ context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) { //nolint:contextcheck // we intentionally use a fresh context for the async operation if !n.opTracker.LastOperation.MarkStart("create") { return managed.ExternalCreation{}, errors.Errorf("%s operation that started at %s is still running", n.opTracker.LastOperation.Type, n.opTracker.LastOperation.StartTime().String()) } @@ -191,7 +191,7 @@ func (n *terraformPluginFrameworkAsyncExternalClient) Create(_ context.Context, return managed.ExternalCreation{}, n.opTracker.LastOperation.Error() } -func (n *terraformPluginFrameworkAsyncExternalClient) Update(_ context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) { +func (n *terraformPluginFrameworkAsyncExternalClient) Update(_ context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) { //nolint:contextcheck // we intentionally use a fresh context for the async operation if !n.opTracker.LastOperation.MarkStart("update") { return managed.ExternalUpdate{}, errors.Errorf("%s operation that started at %s is still running", n.opTracker.LastOperation.Type, n.opTracker.LastOperation.StartTime().String()) } @@ -224,7 +224,7 @@ func (n *terraformPluginFrameworkAsyncExternalClient) Update(_ context.Context, return managed.ExternalUpdate{}, n.opTracker.LastOperation.Error() } -func (n *terraformPluginFrameworkAsyncExternalClient) Delete(_ context.Context, mg xpresource.Managed) error { +func (n *terraformPluginFrameworkAsyncExternalClient) Delete(_ context.Context, mg xpresource.Managed) error { //nolint:contextcheck // we intentionally use a fresh context for the async operation switch { case n.opTracker.LastOperation.Type == "delete": n.opTracker.logger.Debug("The previous delete operation is still ongoing") diff --git a/pkg/controller/external_async_tfpluginsdk.go b/pkg/controller/external_async_tfpluginsdk.go index 6967b9dd..945f2737 100644 --- a/pkg/controller/external_async_tfpluginsdk.go +++ b/pkg/controller/external_async_tfpluginsdk.go @@ -136,7 +136,7 @@ func (n *terraformPluginSDKAsyncExternal) Observe(ctx context.Context, mg xpreso return o, err } -func (n *terraformPluginSDKAsyncExternal) Create(_ context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) { +func (n *terraformPluginSDKAsyncExternal) Create(_ context.Context, mg xpresource.Managed) (managed.ExternalCreation, error) { //nolint:contextcheck // we intentionally use a fresh context for the async operation if !n.opTracker.LastOperation.MarkStart("create") { return managed.ExternalCreation{}, errors.Errorf("%s operation that started at %s is still running", n.opTracker.LastOperation.Type, n.opTracker.LastOperation.StartTime().String()) } @@ -169,7 +169,7 @@ func (n *terraformPluginSDKAsyncExternal) Create(_ context.Context, mg xpresourc return managed.ExternalCreation{}, n.opTracker.LastOperation.Error() } -func (n *terraformPluginSDKAsyncExternal) Update(_ context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) { +func (n *terraformPluginSDKAsyncExternal) Update(_ context.Context, mg xpresource.Managed) (managed.ExternalUpdate, error) { //nolint:contextcheck // we intentionally use a fresh context for the async operation if !n.opTracker.LastOperation.MarkStart("update") { return managed.ExternalUpdate{}, errors.Errorf("%s operation that started at %s is still running", n.opTracker.LastOperation.Type, n.opTracker.LastOperation.StartTime().String()) } @@ -202,7 +202,7 @@ func (n *terraformPluginSDKAsyncExternal) Update(_ context.Context, mg xpresourc return managed.ExternalUpdate{}, n.opTracker.LastOperation.Error() } -func (n *terraformPluginSDKAsyncExternal) Delete(_ context.Context, mg xpresource.Managed) error { +func (n *terraformPluginSDKAsyncExternal) Delete(_ context.Context, mg xpresource.Managed) error { //nolint:contextcheck // we intentionally use a fresh context for the async operation switch { case n.opTracker.LastOperation.Type == "delete": n.opTracker.logger.Debug("The previous delete operation is still ongoing", "tfID", n.opTracker.GetTfID()) diff --git a/pkg/terraform/files.go b/pkg/terraform/files.go index 26a8fe1c..b28bdcb7 100644 --- a/pkg/terraform/files.go +++ b/pkg/terraform/files.go @@ -239,7 +239,7 @@ func (fp *FileProducer) EnsureTFState(_ context.Context, tfID string) error { ProviderConfig: fmt.Sprintf(`provider["registry.terraform.io/%s"]`, fp.Setup.Requirement.Source), Instances: []json.InstanceObjectStateV4{ { - SchemaVersion: uint64(fp.Resource.GetTerraformSchemaVersion()), + SchemaVersion: uint64(fp.Resource.GetTerraformSchemaVersion()), //nolint:gosec PrivateRaw: privateRaw, AttributesRaw: attr, }, diff --git a/pkg/types/conversion/tfjson/tfjson.go b/pkg/types/conversion/tfjson/tfjson.go index 3fe37df6..972c50e6 100644 --- a/pkg/types/conversion/tfjson/tfjson.go +++ b/pkg/types/conversion/tfjson/tfjson.go @@ -34,7 +34,7 @@ func GetV2ResourceMap(resourceSchemas map[string]*tfjson.Schema) map[string]*sch } func v2ResourceFromTFJSONSchema(s *tfjson.Schema) *schemav2.Resource { - v2Res := &schemav2.Resource{SchemaVersion: int(s.Version)} + v2Res := &schemav2.Resource{SchemaVersion: int(s.Version)} //nolint:gosec if s.Block == nil { return v2Res } @@ -78,8 +78,8 @@ func tfJSONAttributeToV2Schema(attr *tfjson.SchemaAttribute) *schemav2.Schema { func tfJSONBlockTypeToV2Schema(nb *tfjson.SchemaBlockType) *schemav2.Schema { //nolint:gocyclo v2sch := &schemav2.Schema{ - MinItems: int(nb.MinItems), - MaxItems: int(nb.MaxItems), + MinItems: int(nb.MinItems), //nolint:gosec + MaxItems: int(nb.MaxItems), //nolint:gosec } // Note(turkenh): Schema representation returned by the cli for block types // does not have optional or computed fields. So, we are trying to infer From deff69065f2a58418603b3a3224eb9c2a974f343 Mon Sep 17 00:00:00 2001 From: Erhan Cagirici Date: Wed, 13 Nov 2024 20:48:01 +0300 Subject: [PATCH 3/4] update GH action dependency versions Signed-off-by: Erhan Cagirici --- .github/workflows/backport.yml | 6 +-- .github/workflows/ci.yml | 61 ++++++++++++++-------- .github/workflows/codeql.yml | 12 ++--- .github/workflows/commands.yml | 13 +++-- .github/workflows/reuse-license-linter.yml | 6 +-- .github/workflows/tag.yml | 6 +-- 6 files changed, 59 insertions(+), 45 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index da228728..58018f12 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -22,16 +22,16 @@ jobs: # The main gotchas with this action are that it _only_ supports merge commits, # and that PRs _must_ be labelled before they're merged to trigger a backport. open-pr: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: github.event.pull_request.merged steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - name: Open Backport PR - uses: zeebe-io/backport-action@v0.0.4 + uses: zeebe-io/backport-action@be567af183754f6a5d831ae90f648954763f17f5 # v3.1.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} github_workspace: ${{ github.workspace }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a0bffaa..b1d711b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ on: env: # Common versions - GO_VERSION: "1.21" - GOLANGCI_VERSION: "v1.55.2" - DOCKER_BUILDX_VERSION: "v0.8.2" + GO_VERSION: "1.22" + GOLANGCI_VERSION: "v1.61.0" + DOCKER_BUILDX_VERSION: "v0.18.0" # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether @@ -26,13 +26,13 @@ env: jobs: detect-noop: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: noop: ${{ steps.noop.outputs.should_skip }} steps: - name: Detect No-op Changes id: noop - uses: fkirc/skip-duplicate-actions@v5.3.0 + uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf # v5.3.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} paths_ignore: '["**.md", "**.png", "**.jpg"]' @@ -40,18 +40,23 @@ jobs: concurrent_skipping: false lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' - steps: + - name: Cleanup Disk + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + with: + large-packages: false + swap-storage: false + - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: ${{ env.GO_VERSION }} @@ -64,14 +69,14 @@ jobs: run: echo "cache=$(go env GOCACHE)" >> $GITHUB_OUTPUT - name: Cache the Go Build Cache - uses: actions/cache@v3 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ${{ steps.go.outputs.cache }} key: ${{ runner.os }}-build-lint-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-build-lint- - name: Cache Go Dependencies - uses: actions/cache@v3 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: .work/pkg key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} @@ -89,18 +94,23 @@ jobs: version: ${{ env.GOLANGCI_VERSION }} check-diff: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' - steps: + - name: Cleanup Disk + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + with: + large-packages: false + swap-storage: false + - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: ${{ env.GO_VERSION }} @@ -111,14 +121,14 @@ jobs: echo "go-mod=$(make go.mod.cachedir)" >> $GITHUB_OUTPUT - name: Cache the Go Build Cache - uses: actions/cache@v3 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ${{ steps.go-cache-paths.outputs.go-build }} key: ${{ runner.os }}-build-check-diff-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-build-check-diff- - name: Cache Go Dependencies - uses: actions/cache@v3 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ${{ steps.go-cache-paths.outputs.go-mod }} key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} @@ -131,13 +141,18 @@ jobs: run: make check-diff unit-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' - steps: + - name: Cleanup Disk + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1 + with: + large-packages: false + swap-storage: false + - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true @@ -145,7 +160,7 @@ jobs: run: git fetch --prune --unshallow - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: ${{ env.GO_VERSION }} @@ -156,14 +171,14 @@ jobs: echo "go-mod=$(make go.mod.cachedir)" >> $GITHUB_OUTPUT - name: Cache the Go Build Cache - uses: actions/cache@v3 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ${{ steps.go-cache-paths.outputs.go-build }} key: ${{ runner.os }}-build-unit-tests-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-build-unit-tests- - name: Cache Go Dependencies - uses: actions/cache@v3 + uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ${{ steps.go-cache-paths.outputs.go-mod }} key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 488020f7..be5bf48c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,13 +13,13 @@ on: jobs: detect-noop: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: noop: ${{ steps.noop.outputs.should_skip }} steps: - name: Detect No-op Changes id: noop - uses: fkirc/skip-duplicate-actions@v5.3.0 + uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf # v5.3.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} paths_ignore: '["**.md", "**.png", "**.jpg"]' @@ -27,20 +27,20 @@ jobs: concurrent_skipping: false analyze: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: detect-noop if: needs.detect-noop.outputs.noop != 'true' steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: true - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3 with: languages: go - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3 diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml index 7d2ffdff..10c60e8e 100644 --- a/.github/workflows/commands.yml +++ b/.github/workflows/commands.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Extract Command id: command - uses: xt0rted/slash-command-action@v1 + uses: xt0rted/slash-command-action@bf51f8f5f4ea3d58abc7eca58f77104182b23e88 # v2.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} command: points @@ -23,7 +23,7 @@ jobs: allow-edits: "false" permission-level: write - name: Handle Command - uses: actions/github-script@v4 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 env: POINTS: ${{ steps.command.outputs.command-arguments }} with: @@ -69,12 +69,12 @@ jobs: # NOTE(negz): See also backport.yml, which is the variant that triggers on PR # merge rather than on comment. backport: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: github.event.issue.pull_request && startsWith(github.event.comment.body, '/backport') steps: - name: Extract Command id: command - uses: xt0rted/slash-command-action@v1 + uses: xt0rted/slash-command-action@bf51f8f5f4ea3d58abc7eca58f77104182b23e88 # v2.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} command: backport @@ -84,13 +84,12 @@ jobs: permission-level: write - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - name: Open Backport PR - uses: zeebe-io/backport-action@v0.0.4 + uses: zeebe-io/backport-action@be567af183754f6a5d831ae90f648954763f17f5 # v3.1.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} github_workspace: ${{ github.workspace }} - version: v0.0.4 diff --git a/.github/workflows/reuse-license-linter.yml b/.github/workflows/reuse-license-linter.yml index b34fd684..a0a68080 100644 --- a/.github/workflows/reuse-license-linter.yml +++ b/.github/workflows/reuse-license-linter.yml @@ -10,10 +10,10 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v2 + uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0 - name: REUSE SPDX SBOM - uses: fsfe/reuse-action@v2 + uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0 with: args: spdx diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index e520dc4c..b924bf0b 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -16,14 +16,14 @@ on: jobs: create-tag: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Create Tag - uses: negz/create-tag@v1 + uses: negz/create-tag@39bae1e0932567a58c20dea5a1a0d18358503320 # v1 with: version: ${{ github.event.inputs.version }} message: ${{ github.event.inputs.message }} From 04d0b9f42ebf96fbb886a59e7e2f94e9deb1913a Mon Sep 17 00:00:00 2001 From: Cem Mergenci Date: Wed, 8 Jan 2025 14:01:43 +0300 Subject: [PATCH 4/4] Remove unintentional indentation. Signed-off-by: Cem Mergenci --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 48a2bc94..08f42249 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,4 @@ [submodule "build"] path = build - url = https://github.com/crossplane/build +url = https://github.com/crossplane/build