Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Ming-Yan authored Oct 23, 2024
2 parents d8542f7 + 07458f7 commit fcbacba
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/QCD_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,23 @@ jobs:
steps:
- uses: actions/checkout@v2



- name: Merge PR locally
if: github.event_name == 'pull_request_target'
id: merge
continue-on-error: true

run: |
git fetch origin pull/${{ github.event.pull_request.number }}/head:MR
git checkout -b ATTEMPT_MERGE
git merge MR
git branch -v
git diff origin master
- name: Check git
run: |
git branch -v
git status
git branch -vv
git remote -v
git diff master
- uses: cvmfs-contrib/github-action-cvmfs@v4
with:
cvmfs_repositories: 'grid.cern.ch'
Expand Down Expand Up @@ -111,8 +110,9 @@ jobs:
- name: Check git
run: |
git branch -v
git diff origin master
git branch -vv
git remote -v
git diff master
- name: QCD workflows with correctionlib
Expand Down

0 comments on commit fcbacba

Please sign in to comment.