Merge with gh-workflows

indigo-dc · Dec 4, 2020 · fe80e67 · fe80e67
1 parent 4e04098
commit fe80e67
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/jenkins.yml b/.github/workflows/jenkins.yml
@@ -6,7 +6,6 @@ on:
       - 'feature/**'
       - 'fix/**'
       - 'docs/**'
-
 jobs:
     create_jenkins_branch:
       name: Creates jenkins/* branch if it does not exist
@@ -37,8 +36,9 @@ jobs:
             git config user.email [email protected]
             git checkout jenkins/${{ env.BRANCH_NAME }}
             git reset --hard origin/${{ env.BRANCH_NAME }}
-            git checkout origin/JePL .sqa/config.yml .sqa/docker-compose.yml Jenkinsfile .git_credential_helper.sh
-            printf "`cat Jenkinsfile`" "${{ env.BRANCH_NAME }}" > Jenkinsfile
+            git checkout origin/JePL .sqa/config.yml .sqa/docker-compose.yml Jenkinsfile .git_credential_helper.sh patch.issue_116
+            git apply patch.issue_116 # FIXME Work around until https://github.com/indigo-dc/jenkins-pipeline-library/issues/116 is fixed
+            printf "`cat Jenkinsfile`" "jenkins/${{ env.BRANCH_NAME }}" > Jenkinsfile
             git add Jenkinsfile
             git status
             git diff-index --quiet HEAD || (git commit -m "Added JePL configuration files" && git push -f)