From 52f1277fffd3d5ddd91ef5548b85cce87ce36f92 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 08:58:32 +1300 Subject: [PATCH 1/9] Adding docker/metadata-action for auto-tagging - *Should* auto-tag based on GitHub branch and tag - Fixes #872 --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 850b35b6..26c1d466 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,6 +133,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: jaedb/iris + - name: Login to DockerHub uses: docker/login-action@v1 with: @@ -143,4 +149,5 @@ jobs: uses: docker/build-push-action@v2 with: push: true - tags: jaedb/iris:latest + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 69b9bc08a764d1f1b2d70c34b0a775ba63fd2509 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 09:10:59 +1300 Subject: [PATCH 2/9] Configuring docker image tagging - Ditching deploy/release, will release on push to master - Tag branch + version + major.minor --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26c1d466..04871b92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: Release on: push: - branches: [master,develop,deploy/release] + branches: [master,develop] jobs: jest: @@ -85,7 +85,7 @@ jobs: name: 'Publish: PyPi' runs-on: ubuntu-latest needs: [jest, tox] - if: github.ref == 'refs/heads/deploy/release' + if: github.ref == 'refs/heads/master' steps: - name: Checkout code uses: actions/checkout@v2 @@ -125,7 +125,7 @@ jobs: name: 'Publish: DockerHub' runs-on: ubuntu-latest needs: [jest, tox] - if: github.ref == 'refs/heads/deploy/release' + if: github.ref == 'refs/heads/master' steps: - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -138,6 +138,10 @@ jobs: uses: docker/metadata-action@v4 with: images: jaedb/iris + tags: | + type=ref,event=push + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} - name: Login to DockerHub uses: docker/login-action@v1 From a08143b5d875f6ccc95254c49a922699ad4406f3 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 09:20:12 +1300 Subject: [PATCH 3/9] Correcting event type --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04871b92..3545dbb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,7 +139,7 @@ jobs: with: images: jaedb/iris tags: | - type=ref,event=push + type=ref,event=branch type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} From 899a706f9e995b8f285299497e1dff72d54ab2b7 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 09:35:30 +1300 Subject: [PATCH 4/9] Adding tag event --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3545dbb2..0ff58f8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: Release on: push: branches: [master,develop] + tags: '*' jobs: jest: @@ -142,6 +143,7 @@ jobs: type=ref,event=branch type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} + type=raw,value=latest - name: Login to DockerHub uses: docker/login-action@v1 From 8b5330dd73038856762ee3d86f2aba71c417abe2 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 09:47:19 +1300 Subject: [PATCH 5/9] Using *release* as workflow trigger, rather than branch push --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ff58f8d..17df3c73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,8 @@ name: Release on: push: branches: [master,develop] - tags: '*' + release: + types: [created] jobs: jest: @@ -86,7 +87,7 @@ jobs: name: 'Publish: PyPi' runs-on: ubuntu-latest needs: [jest, tox] - if: github.ref == 'refs/heads/master' + if: github.event_name == 'release' && github.event.action == 'created' steps: - name: Checkout code uses: actions/checkout@v2 @@ -126,7 +127,7 @@ jobs: name: 'Publish: DockerHub' runs-on: ubuntu-latest needs: [jest, tox] - if: github.ref == 'refs/heads/master' + if: github.event_name == 'release' && github.event.action == 'created' steps: - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -134,13 +135,13 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Docker meta + - name: Generating tags and labels id: meta uses: docker/metadata-action@v4 with: images: jaedb/iris tags: | - type=ref,event=branch + type=ref,event=release type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=raw,value=latest From c42c776821e9ac75790f544d496be130ea94970b Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 09:54:07 +1300 Subject: [PATCH 6/9] Release trigger typos --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17df3c73..c1e0d7bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,10 @@ name: Release on: + release: + types: [published] push: branches: [master,develop] - release: - types: [created] jobs: jest: @@ -141,10 +141,10 @@ jobs: with: images: jaedb/iris tags: | - type=ref,event=release + type=raw,value=latest + type=ref type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} - type=raw,value=latest - name: Login to DockerHub uses: docker/login-action@v1 From 4869971765449ed1ea92a2b83e990f2d6fa1ed51 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 10:00:52 +1300 Subject: [PATCH 7/9] Listen for all 'release' events --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1e0d7bf..42987ea8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: name: 'Publish: PyPi' runs-on: ubuntu-latest needs: [jest, tox] - if: github.event_name == 'release' && github.event.action == 'created' + if: github.event_name == 'release' steps: - name: Checkout code uses: actions/checkout@v2 @@ -127,7 +127,7 @@ jobs: name: 'Publish: DockerHub' runs-on: ubuntu-latest needs: [jest, tox] - if: github.event_name == 'release' && github.event.action == 'created' + if: github.event_name == 'release' steps: - name: Set up QEMU uses: docker/setup-qemu-action@v1 From 95de0a1cb13ff1403d9bcfa6d5a146bb2c320473 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 10:07:26 +1300 Subject: [PATCH 8/9] Adding workflow_dispatch event --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42987ea8..e140044a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,7 @@ jobs: images: jaedb/iris tags: | type=raw,value=latest - type=ref + type=ref,event=workflow_dispatch type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} From 737b774ea02ef923a1bca49dd96d2834db60b0ef Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Sat, 19 Nov 2022 10:13:15 +1300 Subject: [PATCH 9/9] Release not supported? --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e140044a..b3a4d5f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,8 +141,7 @@ jobs: with: images: jaedb/iris tags: | - type=raw,value=latest - type=ref,event=workflow_dispatch + latest type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}}