From 6af72325c158831c67b04b0e1c74339952c63493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Fournier?= Date: Mon, 5 Jun 2023 14:34:22 +0200 Subject: [PATCH] chore: simplify workflows (#3902) ## About the changes This PR removes one workflow file and merges it into a similar workflow file, these are the differences: ![image](https://github.com/Unleash/unleash/assets/455064/8afa791e-5f78-45cb-baca-1c28d4559d51) This should help improving maintainability of the workflows --- ..._publish_main.yaml => docker_publish.yaml} | 11 ++++- .github/workflows/docker_publish_tags.yaml | 40 ------------------- 2 files changed, 9 insertions(+), 42 deletions(-) rename .github/workflows/{docker_publish_main.yaml => docker_publish.yaml} (71%) delete mode 100644 .github/workflows/docker_publish_tags.yaml diff --git a/.github/workflows/docker_publish_main.yaml b/.github/workflows/docker_publish.yaml similarity index 71% rename from .github/workflows/docker_publish_main.yaml rename to .github/workflows/docker_publish.yaml index 2237732529..2b799d75cf 100644 --- a/.github/workflows/docker_publish_main.yaml +++ b/.github/workflows/docker_publish.yaml @@ -1,9 +1,11 @@ -name: Publish main branch to dockerhub +name: Publish to dockerhub on: push: branches: - main + tags: + - 'v*' jobs: build: @@ -25,7 +27,12 @@ jobs: images: | unleashorg/unleash-server tags: | - type=edge,prefix=main-,suffix=-${{ matrix.version }} + # only enabled for v* tags: + type=semver,pattern={{ version }},enable=${{ startsWith(github.ref, 'refs/tags/v') }} + type=semver,pattern={{ major.minor }},enable=${{ startsWith(github.ref, 'refs/tags/v') }} + type=semver,pattern={{ major }},enable=${{ startsWith(github.ref, 'refs/tags/v') }} + # only enabled in main: + type=edge,prefix=main-,suffix=-${{ matrix.version }},enable=${{ github.ref == 'refs/heads/main' }} - name: Login to docker hub uses: docker/login-action@v2 with: diff --git a/.github/workflows/docker_publish_tags.yaml b/.github/workflows/docker_publish_tags.yaml deleted file mode 100644 index 981b439850..0000000000 --- a/.github/workflows/docker_publish_tags.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: Push Tags - -on: - push: - tags: - - 'v*' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup QEmu so we can build multiplatform - uses: docker/setup-qemu-action@v2 - - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 - - name: Docker meta configuration - uses: docker/metadata-action@v3 - id: meta - with: - images: | - unleashorg/unleash-server - tags: | - type=semver,pattern={{ version }} - type=semver,pattern={{ major.minor }} - type=semver,pattern={{ major }} - - name: Login to docker hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build tag and push image to Docker hub - uses: docker/build-push-action@v3 - with: - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: NODE_VERSION=18-alpine