From 9ab5af64add88fc2e83387a727e53f8f0f9ae9d8 Mon Sep 17 00:00:00 2001 From: cdean-github Date: Fri, 16 Jul 2021 12:15:28 -0400 Subject: [PATCH 1/2] Adding comment for users in *runEval* --- detectors/EICDetector/Fun4All_runEvaluators.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detectors/EICDetector/Fun4All_runEvaluators.C b/detectors/EICDetector/Fun4All_runEvaluators.C index d1fbba27..a3178510 100644 --- a/detectors/EICDetector/Fun4All_runEvaluators.C +++ b/detectors/EICDetector/Fun4All_runEvaluators.C @@ -64,7 +64,7 @@ int Fun4All_runEvaluators( //----- Enable::DSTREADER = false; - Enable::USER = false; + Enable::USER = false; // Enable this to run custom code from G4_User.C Enable::EVENT_EVAL = true; Enable::TRACKING_EVAL = true; From a5acd1fc93b83b1c3dd372a7a5a60170c4ad9686 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Fri, 16 Jul 2021 14:09:36 -0400 Subject: [PATCH 2/2] Create sync-with-production.yml --- .github/workflows/sync-with-production.yml | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/sync-with-production.yml diff --git a/.github/workflows/sync-with-production.yml b/.github/workflows/sync-with-production.yml new file mode 100644 index 00000000..244b1b9b --- /dev/null +++ b/.github/workflows/sync-with-production.yml @@ -0,0 +1,26 @@ +name: Sync production branches +on: + push: + branches: + - 'production' +jobs: + sync-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - name: Merge production -> production_singleElectron_0-20GeV + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: production + target_branch: production_singleElectron_0-20GeV + github_token: ${{ github.token }} + + - name: Merge production -> production_singlePion_0-20GeV + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: production + target_branch: production_singlePion_0-20GeV + github_token: ${{ github.token }}