fixed tagging

RasaHQ · Mar 7, 2020 · fcc0d42 · fcc0d42
1 parent ce4efc2
commit fcc0d42
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml
@@ -187,21 +187,24 @@ jobs:
       run: docker build . --file ${{ matrix.image.file }} --tag rasa/rasa:latest${{ matrix.image.tag_ext }} --cache-from rasa/rasa:latest${{ matrix.image.tag_ext }}
 
     - name: Push image with latest tag 📦
-      if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master'
       run: docker push rasa/rasa:latest${{ matrix.image.tag_ext }}
 
     - name: Push image with ${{github.ref}} tag 📦
-      if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+      env:
+        GITHUB_TAG: ${{ github.ref }}
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
       run: |
-        docker tag rasa/rasa:latest${{ matrix.image.tag_ext }} rasa/rasa:${{github.ref}}${{ matrix.image.tag_ext }}
-        docker push rasa/rasa:${{github.ref}}${{ matrix.image.tag_ext }}
+        GITHUB_TAG=${GITHUB_TAG/refs\/tags\//}
+        docker tag rasa/rasa:latest${{ matrix.image.tag_ext }} rasa/rasa:${GITHUB_TAG}${{ matrix.image.tag_ext }}
+        docker push rasa/rasa:${GITHUB_TAG}${{ matrix.image.tag_ext }}
 
   deploy:
     name: Deploy to PyPI
     runs-on: ubuntu-latest
 
     # deploy will only be run when there is a tag available
-    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     needs: [quality, test, api, docker]  # only run after all other stages succeeded
 
     steps:
@@ -240,6 +243,7 @@ jobs:
         GITHUB_REPO_SLUG: ${{ github.repository }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
+        GITHUB_TAG=${GITHUB_TAG/refs\/tags\//}
         sudo apt-get update
         sudo apt-get -y install pandoc
         pip install -U github3.py pypandoc