Fix version on github actions.

DigitalSlideArchive · Aug 30, 2023 · a83e756 · a83e756
1 parent 34ef17f
commit a83e756
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,6 +100,8 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
+    - name: Print GutHub branch
+      run: env
     - name: Build SDist
       run: pipx run build --sdist
     - uses: actions/upload-artifact@v3
@@ -130,7 +132,8 @@ jobs:
         with:
           name: artifact
           path: dist
-          skip-existing: true
       - name: List dist directory
         run: ls dist
       - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          skip-existing: true
diff --git a/setup.py b/setup.py
@@ -30,7 +30,8 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') in {'master'} or os.getenv('CI_BRANCH') in {'master'}:
+    if (os.getenv('CIRCLE_BRANCH') or os.getenv('CI_BRANCH') or
+            os.getenv('GITHUB_BASE_REF')) in {'master'}:
         return ''
     else:
         return get_local_node_and_date(version)