Strip refs/heads/ from full branch ref path

AcademySoftwareFoundation · Jan 21, 2020 · 308981d · 308981d
1 parent eb4fc4f
commit 308981d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/wiki.yaml b/.github/workflows/wiki.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - wiki-merge-utils
     paths:
       - '.gitlab/workflows/wiki.yaml'
       - 'wiki/**'
@@ -55,7 +56,7 @@ jobs:
   publish:
     name: Publish to GitHub Wiki
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || github.repository == 'wwfxuk/rez'
     needs: build
 
     steps:

diff --git a/wiki/update-wiki.py b/wiki/update-wiki.py
@@ -42,7 +42,7 @@
 TMP_NAME = ".rez-gen-wiki-tmp"  # See also: .gitignore
 TEMP_WIKI_DIR = os.getenv("TEMP_WIKI_DIR", os.path.join(THIS_DIR, TMP_NAME))
 GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", "nerdvegas/rez")
-GITHUB_BRANCH = os.getenv("GITHUB_BRANCH", "master")
+GITHUB_BRANCH = os.getenv("GITHUB_BRANCH", "master").replace("refs/heads/", "")
 GITHUB_WORKFLOW = os.getenv("GITHUB_WORKFLOW", "Wiki")
 CLONE_URL = os.getenv(
     "CLONE_URL",