Fix CI errors - slash in branch name and Python version (#1983)

.github/jobs/docker_utils.py

@@ -61,18 +61,21 @@ def get_branch_name():
     # get branch name from env var BRANCH_NAME
     branch_name = os.environ.get('BRANCH_NAME')
     if branch_name:
-        return branch_name
+        return branch_name.replace('/', '_')
 
     # if BRANCH_NAME not set, use GITHUB env vars
     github_event_name = os.environ.get('GITHUB_EVENT_NAME')
     if not github_event_name:
         return None
 
     if github_event_name == 'pull_request':
-        return os.environ.get('GITHUB_HEAD_REF')
+        branch_name = os.environ.get('GITHUB_HEAD_REF')
+        if branch_name:
+            branch_name = branch_name.replace('/', '_')
+        return branch_name
 
     github_ref = os.environ.get('GITHUB_REF')
     if github_ref is None:
         return None
 
-    return github_ref.replace('refs/heads/', '')
+    return github_ref.replace('refs/heads/', '').replace('/', '_')

.github/workflows/documentation.yml

@@ -3,9 +3,9 @@ on:
   push:
     branches:
       - develop
-      - feature_*
-      - main_*
-      - bugfix_*
+      - feature_**
+      - main_**
+      - bugfix_**
     paths:
       - docs/**
   pull_request:
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade sphinx sphinx-gallery sphinx_rtd_theme

.github/workflows/testing.yml

@@ -6,9 +6,9 @@ on:
     branches:
       - develop
       - develop-ref
-      - 'feature_*'
-      - 'main_*'
-      - 'bugfix_*'
+      - 'feature_**'
+      - 'main_**'
+      - 'bugfix_**'
     paths-ignore:
       - 'docs/**'
 
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Get METplus Image
         run: .github/jobs/docker_setup.sh
         env: