From 39e6683342edc2bc8f2630c3bec6f5178ff12097 Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Mon, 17 Jun 2024 12:26:50 -0700 Subject: [PATCH 1/4] Migrate release-2.0-untagged to GHA --- .drone.yml | 37 ------------------------------------- .github/workflows/ci.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 37 deletions(-) delete mode 100644 .drone.yml create mode 100644 .github/workflows/ci.yaml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index e648c5f2..00000000 --- a/.drone.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -kind: pipeline -type: docker -name: amd64 - -platform: - os: linux - arch: amd64 - -steps: - - name: test - image: registry.suse.com/bci/golang:1.20 - commands: - - go install github.com/golang/mock/mockgen@v1.6.0 - - ./scripts/ci - volumes: - - name: docker - path: /var/run/docker.sock - ---- -kind: pipeline -type: docker -name: arm64 - -platform: - os: linux - arch: arm64 - -steps: - - name: test - image: registry.suse.com/bci/golang:1.20 - commands: - - go install github.com/golang/mock/mockgen@v1.6.0 - - ./scripts/ci - volumes: - - name: docker - path: /var/run/docker.sock diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..d28a791c --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,28 @@ +name: Wrangler CI + +on: + push: + pull_request: + tags: + - v* + branches: + - 'release-*' + - 'master' + +jobs: + ci: + strategy: + matrix: + arch: + - amd64 + - arm64 + runs-on: org-${{ github.repository_owner_id }}-${{ matrix.arch }}-k8s + container: registry.suse.com/bci/golang:1.22 + steps: + - name : Checkout repository + # https://github.com/actions/checkout/releases/tag/v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - name : Install mockgen + run: go install -v -x github.com/golang/mock/mockgen@v1.6.0 + - name : Run CI + run: bash scripts/ci From 603b389bca4cf216a85ccaa550d5025553c66a65 Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Mon, 17 Jun 2024 13:22:50 -0700 Subject: [PATCH 2/4] Update action versions to move from node 16 to 20 --- .github/workflows/lint.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 85ebcff9..959adf84 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,8 +1,5 @@ name: golangci-lint -env: - SETUP_GO_VERSION: '^1.19' - on: push: pull_request: @@ -18,21 +15,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: ${{ env.SETUP_GO_VERSION }} + go-version-file: go.mod - name: Generate Golang run: | export PATH=$PATH:/home/runner/go/bin/ - name: golangci-lint - uses: golangci/golangci-lint-action@v3.4.0 + uses: golangci/golangci-lint-action@v4.0.0 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.51 + version: v1.57 From 9b0e58f2d8c099e996b9561fd585482bd0d2875e Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Wed, 19 Jun 2024 16:21:32 -0700 Subject: [PATCH 3/4] Bump go version to 1.22 --- go.mod | 2 +- go.sum | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 658716b2..0fae5129 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/wrangler -go 1.20 +go 1.22 require ( github.com/evanphx/json-patch v4.12.0+incompatible diff --git a/go.sum b/go.sum index 6a774217..c61ef356 100644 --- a/go.sum +++ b/go.sum @@ -256,6 +256,7 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -330,6 +331,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -393,12 +395,14 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -451,6 +455,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= From 3e26ecf75b6cf4cadd020e2c01786ae59595f909 Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Fri, 12 Jul 2024 14:04:20 -0700 Subject: [PATCH 4/4] Stay on golang 1.20 And also uses SHAs to specify github action versions. --- .github/workflows/ci.yaml | 2 +- .github/workflows/lint.yaml | 9 ++++++--- go.mod | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d28a791c..a32edbfd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - amd64 - arm64 runs-on: org-${{ github.repository_owner_id }}-${{ matrix.arch }}-k8s - container: registry.suse.com/bci/golang:1.22 + container: registry.suse.com/bci/golang:1.20 steps: - name : Checkout repository # https://github.com/actions/checkout/releases/tag/v4.1.1 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 959adf84..57ab839a 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,12 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + # https://github.com/actions/checkout/releases/tag/v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive - name: Setup Go - uses: actions/setup-go@v5 + # https://github.com/actions/setup-go/releases/tag/v5.0.0 + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: go-version-file: go.mod @@ -29,7 +31,8 @@ jobs: export PATH=$PATH:/home/runner/go/bin/ - name: golangci-lint - uses: golangci/golangci-lint-action@v4.0.0 + # https://github.com/golangci/golangci-lint-action/releases/tag/v6.0.1 + uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. version: v1.57 diff --git a/go.mod b/go.mod index 0fae5129..658716b2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/wrangler -go 1.22 +go 1.20 require ( github.com/evanphx/json-patch v4.12.0+incompatible