Fix determination of f-string expression spans (#2654)

[etc/vim.git] / .github / workflows / docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 09390130b3dd8f423af0821abafbdd448f291f86..0825385c6c08989d763a7bb0dea24df6f8cf471f 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,10 +3,13 @@ name: docker
 on:
   push:
     branches:
-      - "master"
+      - "main"
+  release:
+    types: [published]
 
 jobs:
   docker:
+    if: github.repository == 'psf/black'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -24,13 +27,27 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Check + set version tag
+        run:
+          echo "GIT_TAG=$(git describe --candidates=0 --tags 2> /dev/null || echo
+          latest_non_release)" >> $GITHUB_ENV
+
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: pyfound/black:latest
+          tags: pyfound/black:latest,pyfound/black:${{ env.GIT_TAG }}
+
+      - name: Build and push latest_release tag
+        if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: pyfound/black:latest_release
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}