diff --git a/.github/workflows/gh-test-external-registry.yml b/.github/workflows/gh-test-external-registry.yml index 007922afe..844874cea 100644 --- a/.github/workflows/gh-test-external-registry.yml +++ b/.github/workflows/gh-test-external-registry.yml @@ -23,16 +23,15 @@ jobs: runs-on: ubuntu-latest environment: GCR e2e steps: - - name: Set up Go 1.x - uses: actions/setup-go@v5 - with: - go-version: '1.22' - name: Check out code into the Go module directory uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - path: src/github.com/${{ github.repository }} persist-credentials: false + - name: Set up Go 1.x + uses: actions/setup-go@v5 + with: + go-version-file: go.mod - name: Run Tests env: IMGPKG_E2E_IMAGE: "gcr.io/cf-k8s-lifecycle-tooling-klt/github-action-test-relocation" @@ -47,7 +46,6 @@ jobs: export GOPATH=$(echo `pwd`) export PATH="$PATH:$GOPATH/bin" - cd src/github.com/${{ github.repository }} docker login -u _json_key --password-stdin https://gcr.io <<< "$GCR_PASSWORD" diff --git a/.github/workflows/gh-test.yml b/.github/workflows/gh-test.yml index b13921110..295b89020 100644 --- a/.github/workflows/gh-test.yml +++ b/.github/workflows/gh-test.yml @@ -11,22 +11,16 @@ jobs: name: Test GH - Linux runs-on: ubuntu-latest steps: - - name: Set up Go 1.x - uses: actions/setup-go@v5 - with: - go-version: '1.22' - name: Check out code into the Go module directory uses: actions/checkout@v4 + - name: Set up Go 1.x + uses: actions/setup-go@v5 with: - path: src/github.com/${{ github.repository }} + go-version-file: go.mod - name: Run Tests run: | set -e -x - export GOPATH=$(echo `pwd`) - export PATH="$PATH:$GOPATH/bin" - cd src/github.com/${{ github.repository }} - # deploy local registry and run tests ./hack/test-all-local-registry.sh @@ -34,22 +28,17 @@ jobs: name: Test GH - Windows runs-on: windows-latest steps: - - name: Set up Go 1.x - uses: actions/setup-go@v5 - with: - go-version: '1.22' - name: Check out code into the Go module directory uses: actions/checkout@v4 + - name: Set up Go 1.x + uses: actions/setup-go@v5 with: - path: src/github.com/${{ github.repository }} + go-version-file: go.mod - name: Install dependencies run: | bash -c ' set -e -x - export GOPATH=$(echo `pwd`) - export PATH="$GOPATH/bin:$PATH" - go install github.com/sigstore/cosign/cmd/cosign@v0.5.0 alias cosign=cosign.exe @@ -59,10 +48,6 @@ jobs: bash -c ' set -e -x - export GOPATH=$(echo `pwd`) - export PATH="$GOPATH/bin:$PATH" - cd src/github.com/${{ github.repository }} - export IMGPKG_BINARY_EXT=".exe" ./hack/build.sh ' @@ -75,10 +60,6 @@ jobs: docker stop registry } - export GOPATH=$(echo `pwd`) - export PATH="$GOPATH/bin:$PATH" - cd src/github.com/${{ github.repository }} - export IMGPKG_E2E_IMAGE="localhost:5000/github-action-test-relocation-$GITHUB_RUN_ID" export IMGPKG_E2E_RELOCATION_REPO="localhost:5000/github-action-imgpkg-test-$GITHUB_RUN_ID" @@ -97,10 +78,6 @@ jobs: bash -c ' set -e -x - export GOPATH=$(echo `pwd`) - export PATH="$GOPATH/bin:$PATH" - cd src/github.com/${{ github.repository }} - export IMGPKG_E2E_IMAGE="ttl.sh/github-action-test-relocation-$GITHUB_RUN_ID" export IMGPKG_E2E_RELOCATION_REPO="ttl.sh/github-action-imgpkg-test-$GITHUB_RUN_ID" export IMGPKG_BINARY="$PWD/imgpkg.exe" diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 798b44d11..851723645 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -12,13 +12,13 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - name: Set up Go 1.x - uses: actions/setup-go@v5 - with: - go-version: '1.22' - uses: actions/checkout@v4 with: fetch-depth: '0' + - name: Set up Go 1.x + uses: actions/setup-go@v5 + with: + go-version-file: go.mod - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 05c53e512..90d77ed4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,10 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set up Go + - name: Set up Go 1.x uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version-file: go.mod - name: Set up Cosign uses: sigstore/cosign-installer@v3 - name: Retrieve version diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index d7e6d4738..d40bc4bbb 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -11,7 +11,6 @@ jobs: with: repo: carvel-dev/imgpkg tool: imgpkg - goVersion: '1.22' secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/update-go.yml b/.github/workflows/update-go.yml new file mode 100644 index 000000000..885019833 --- /dev/null +++ b/.github/workflows/update-go.yml @@ -0,0 +1,39 @@ +name: go-updater + +on: + schedule: + - cron: '0 12 * * *' + workflow_dispatch: + +jobs: + update-go: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Set up Go 1.x + uses: actions/setup-go@v5 + with: + go-version: 'stable' + check-latest: true + - name: Update Go + run: go get go + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.CARVEL_BOT_ACCESS_TOKEN }} + committer: Carvel Bot + author: Carvel Bot + commit-message: | + Bump go + + Signed-off-by: Carvel Bot + title: Bump go + delete-branch: true + body: | + Auto-generated by https://github.com/${{github.repository}}/actions/runs/${{github.run_id}} + Signed-off-by: Carvel Bot + base: develop + branch: bump-go diff --git a/go.mod b/go.mod index 4d500583c..52027321f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module carvel.dev/imgpkg -go 1.22.3 +go 1.22.4 require ( github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04