From 1080e062373cc6d975d9f8b89057efab373a1167 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Thu, 6 Mar 2025 00:42:16 +0100 Subject: [PATCH 1/2] Update Github actions --- .github/workflows/package.yml | 18 +++++++++--------- .github/workflows/pull-request.yml | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 52c52a1..6ce51c9 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -14,11 +14,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: go.mod - name: Build and Test @@ -28,27 +28,27 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to Docker hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: xperimental password: ${{ secrets.DOCKER_TOKEN }} - name: Docker Metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ghcr.io/xperimental/goecho @@ -58,7 +58,7 @@ jobs: type=ref,event=branch type=ref,event=pr - name: Build and push Docker images - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4de06f3..5d63d6b 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -7,8 +7,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: go-version-file: go.mod - name: golangci-lint From 91fb4d5decfb826acb7d5514b90d4244227f4b8b Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Thu, 6 Mar 2025 00:44:39 +0100 Subject: [PATCH 2/2] Only login when building branch --- .github/workflows/package.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6ce51c9..f835dc9 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -37,12 +37,14 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry uses: docker/login-action@v3 + if: ${{ github.event_name != 'pull_request' }} with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to Docker hub uses: docker/login-action@v3 + if: ${{ github.event_name != 'pull_request' }} with: username: xperimental password: ${{ secrets.DOCKER_TOKEN }}