From fe80e67a42a4db5b673832424a9636276d5637ab Mon Sep 17 00:00:00 2001 From: Pablo Orviz Date: Fri, 4 Dec 2020 15:50:26 +0100 Subject: [PATCH] Merge with gh-workflows --- .github/workflows/jenkins.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jenkins.yml b/.github/workflows/jenkins.yml index 8743ba80..9c670345 100644 --- 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 github-actions@github.com 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)