From ad210f2b754d267df68e3497362a0424ffab967f Mon Sep 17 00:00:00 2001 From: Wanjohi <71614375+wanjohiryan@users.noreply.github.com> Date: Sun, 19 May 2024 04:42:14 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(git):=20Fix=20release=20(#45?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description **What issue are you solving (or what feature are you adding) and how are you doing it?** Well, I tried doing a release and it did not go as expected, due to some issues with the git_token plus concurrency. So, i have fixed that... let us do a re-release. --- .github/workflows/base.yml | 52 ++++++++++++++++++++++++++++++++---- .github/workflows/relay.yml | 52 ++++++++++++++++++++++++++++++++---- .github/workflows/server.yml | 52 ++++++++++++++++++++++++++++++++---- .github/workflows/warp.yml | 10 +++---- 4 files changed, 146 insertions(+), 20 deletions(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 4daf4878..c781494d 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -19,13 +19,13 @@ on: release: types: [created] -concurrency: - group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} - cancel-in-progress: true +# concurrency: +# group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} +# cancel-in-progress: true env: REGISTRY: ghcr.io - IMAGE_NAME: wanjohiryan/netris + IMAGE_NAME: netridotme/netris BASE_TAG_PREFIX: base jobs: @@ -67,7 +67,49 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GIT_MASTER_TOKEN }} + - + name: Extract Container metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }} + # + #tag on release, and a nightly build for 'dev' + tags: | + type=raw,value=nightly,enable={{is_default_branch}} + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + - + name: Build Docker image + uses: docker/build-push-action@v5 + with: + file: base.Dockerfile + context: ./ + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + build-docker-release: + name: Build image on release + if: ${{ github.event_name == 'release' }} + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - + name: Checkout repo + uses: actions/checkout@v4 + - + name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GIT_MASTER_TOKEN }} - name: Extract Container metadata id: meta diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index b8723fd7..beb9c0b0 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -19,13 +19,13 @@ on: release: types: [created] -concurrency: - group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} - cancel-in-progress: true +# concurrency: +# group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} +# cancel-in-progress: true env: REGISTRY: ghcr.io - IMAGE_NAME: wanjohiryan/netris + IMAGE_NAME: netrisdotme/netris BASE_TAG_PREFIX: relay jobs: @@ -67,7 +67,49 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GIT_MASTER_TOKEN }} + - + name: Extract Container metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }} + # + #tag on release, and a nightly build for 'dev' + tags: | + type=raw,value=nightly,enable={{is_default_branch}} + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + - + name: Build Docker image + uses: docker/build-push-action@v5 + with: + file: relay.Dockerfile + context: ./ + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + build-docker-release: + name: Build image on release + if: ${{ github.event_name == 'release' }} + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - + name: Checkout repo + uses: actions/checkout@v4 + - + name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GIT_MASTER_TOKEN }} - name: Extract Container metadata id: meta diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index bf21cb61..ef2dfc09 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -23,12 +23,12 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: wanjohiryan/netris + IMAGE_NAME: netrisdotme/netris BASE_TAG_PREFIX: server -concurrency: - group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} - cancel-in-progress: true +# concurrency: +# group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} +# cancel-in-progress: true jobs: build-docker-pr: @@ -69,7 +69,49 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GIT_MASTER_TOKEN }} + - + name: Extract Container metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }} + # + #tag on release, and a nightly build for 'dev' + tags: | + type=raw,value=nightly,enable={{is_default_branch}} + type=ref,event=tag + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + - + name: Build Docker image + uses: docker/build-push-action@v5 + with: + file: server.Dockerfile + context: ./ + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + build-docker-release: + name: Build image on release + if: ${{ github.event_name == 'release' }} + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - + name: Checkout repo + uses: actions/checkout@v4 + - + name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GIT_MASTER_TOKEN }} - name: Extract Container metadata id: meta diff --git a/.github/workflows/warp.yml b/.github/workflows/warp.yml index 2ddc35ac..4f00a80e 100644 --- a/.github/workflows/warp.yml +++ b/.github/workflows/warp.yml @@ -22,12 +22,12 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: wanjohiryan/netris + IMAGE_NAME: netrisdotme/netris BASE_TAG_PREFIX: warp -concurrency: - group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} - cancel-in-progress: true +# concurrency: +# group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} +# cancel-in-progress: true jobs: build-docker-pr: @@ -72,7 +72,7 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GIT_MASTER_TOKEN }} - name: Extract Container metadata id: meta