From e9699859b71bc68e58a363cbe9b11c1fd3b6ac76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Thu, 27 Apr 2023 21:17:01 +0200 Subject: [PATCH 01/88] Create action.yml --- .github/actions/submodulePR/action.yml | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/actions/submodulePR/action.yml diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml new file mode 100644 index 000000000..f7321ce84 --- /dev/null +++ b/.github/actions/submodulePR/action.yml @@ -0,0 +1,42 @@ +name: "Automatic PR on framework at submodule PR" +inputs: + branch: + description: "Branch to perform the PR" + required: true + submodule: + description: "Relative path to the submodule" + required: true + token: + description: "Authentification token" + required: true + +runs: + using: 'composite' + steps: + - name: Checkout framework repository and branch + uses: rest-for-physics/framework/.github/actions/checkout@master + with: + branch: ${{ inputs.branch }} + repository: rest-for-physics/framework + path: framework + - name: Pull submodules + run: | + cd framework + ./scripts/checkoutRemoteBranch.sh ${{ inputs.branch }} + python3 pull-submodules.py --force --dontask --latest:${{ inputs.branch }} + shell: bash + - name: Check if framework branch exist + id: frameworkBranch + run: | + cd framework + echo "ref=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT + shell: bash + - name: Commit changes + if: steps.frameworkBranch.outputs.ref == ${{ inputs.branch }} + run: | + cd framework + git submodule update --remote ${{ inputs.submodule }} + git commit -am "Updating submodule ${{ inputs.submodule }}" + git push + shell: bash + From 85ac9752632a341604fd46c62745ab1f5cee5bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:03:25 +0200 Subject: [PATCH 02/88] Adding automatic PR in case target branch doesn't exist --- .github/actions/submodulePR/action.yml | 47 ++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index f7321ce84..615ae3f9f 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -1,7 +1,7 @@ name: "Automatic PR on framework at submodule PR" inputs: branch: - description: "Branch to perform the PR" + description: "Target branch name" required: true submodule: description: "Relative path to the submodule" @@ -13,11 +13,12 @@ inputs: runs: using: 'composite' steps: - - name: Checkout framework repository and branch - uses: rest-for-physics/framework/.github/actions/checkout@master + - name: Checkout framework repository + uses: actions/checkout@v3 with: - branch: ${{ inputs.branch }} + token: ${{ inputs.github_token }} repository: rest-for-physics/framework + ref: master path: framework - name: Pull submodules run: | @@ -31,7 +32,7 @@ runs: cd framework echo "ref=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT shell: bash - - name: Commit changes + - name: Commit changes if branch exist if: steps.frameworkBranch.outputs.ref == ${{ inputs.branch }} run: | cd framework @@ -39,4 +40,38 @@ runs: git commit -am "Updating submodule ${{ inputs.submodule }}" git push shell: bash - + - name: Commit changes to new branch + if: steps.frameworkBranch.outputs.ref == "master" + run: | + cd framework + git submodule update --remote ${{ inputs.submodule }} + git checkout -b ${{ inputs.branch }} + git commit -am "Updating submodule ${{ inputs.submodule }}" + git push --set-upstream origin ${{ inputs.branch }} + shell: bash + - name: Checkout submodule + if: steps.frameworkBranch.outputs.ref == "master" + uses: actions/checkout@v3 + with: + ref: ${{ inputs.branch }} + path: submodule + - name: Check submodule PR + id: PRCheck + if: steps.frameworkBranch.outputs.ref == "master" + run: | + cd submodule + #Check PR + gh auth status + gh pr view + prurl=$(gh pr view --json url -t '{{ .url }}') + echo "prurl=$prurl" >> $GITHUB_OUTPUT + env: + GITHUB_TOKEN: ${{ inputs.token }} + shell: bash + - name: Create PR + if: steps.frameworkBranch.outputs.ref == "master" + run: | + gh pr create -B master -H ${{ inputs.branch }} --title 'Submodule Updates from ${{ inputs.submodule }} branch ${{ inputs.branch }}' --body 'Automatic PR from ${{ inputs.submodule }} branch ${{ inputs.branch }}, related PR ${{ steps.PRCheck.outputs.prurl }}' + env: + GITHUB_TOKEN: ${{ inputs.github_token }} + shell: bash From 07ca9cd554bc61532b78f08ebf96f18bb6dc9dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 10:14:40 +0200 Subject: [PATCH 03/88] Adding label, which is meant to block submodule PR (needs to be done in framework) --- .github/actions/submodulePR/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 615ae3f9f..48f940e78 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -57,7 +57,6 @@ runs: path: submodule - name: Check submodule PR id: PRCheck - if: steps.frameworkBranch.outputs.ref == "master" run: | cd submodule #Check PR @@ -65,6 +64,8 @@ runs: gh pr view prurl=$(gh pr view --json url -t '{{ .url }}') echo "prurl=$prurl" >> $GITHUB_OUTPUT + #Create label for further usage + gh label create framework-pr --description "This PR has to be merged from framework" --color E99695 env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash From fa9eac047caf982de7b18145a2e4bebe8a819b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:11:43 +0200 Subject: [PATCH 04/88] New workflow for automatic merge on submodule PR --- .github/workflows/automerge.yml | 101 ++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 000000000..7ac443627 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,101 @@ +name: "Automatic PR checks and merge" +name: Check on submodules PR + +on: + pull_request: + branches: [ "master" ] + types: [ "opened", "reopened", "created", "closed", "synchronize"] + + workflow_dispatch: + +#permissions: write-all + +env: + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + +defaults: + run: + shell: bash + +jobs: + submodule-pr: + strategy: + matrix: + submodule: ["rest-for-physics/rawlib", "rest-for-physics/detectorlib", "rest-for-physics/geant4lib","rest-for-physics/tracklib", "rest-for-physics/connectorslib", "rest-for-physics/axionlib", "rest-for-physics/legacylib", , "rest-for-physics/wimplib", "rest-for-physics/restG4"] + runs-on: ubuntu-latest + if: github.head_ref || github.ref_name != 'master' + steps: + - name: Checkout submodule + uses: actions/checkout@v3 + with: + repository: ${{ matrix.submodule }} + path: submodule + - name: Check submodule branch + id: submoduleBranch + run: | + cd submodule + var=$(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) + if [[ -z $var ]]; then + echo "Branch "${{ env.BRANCH_NAME }}" not found in " ${{ matrix.submodule }} + echo "exist=false" >> $GITHUB_OUTPUT + else + echo "Branch "${{ env.BRANCH_NAME }}" found in " ${{ matrix.submodule }} + git fetch + git checkout ${{ env.BRANCH_NAME }} + git pull + echo "exist=true" >> $GITHUB_OUTPUT + fi + shell: bash + - name: Check PR + id: PRCheck + if: steps.submoduleBranch.outputs.exist == 'true' + run: | + cd submodule + #Check PR + gh auth status + gh pr view + prurl=$(gh pr view --json url -t '{{ .url }}') + echo "prurl=$prurl" >> $GITHUB_OUTPUT + mergeStateStatus=$(gh pr view --json mergeStateStatus -t '{{ .mergeStateStatus }}') + echo "MergeStateStatus " $mergeStateStatus + echo "mergeStateStatus=$mergeStateStatus" >> $GITHUB_OUTPUT + prState=$(gh pr view --json state -t '{{ .state }}') + echo "prState=$prState" >> $GITHUB_OUTPUT + echo "PullRequestState " $prState + review=$(gh pr view --json reviewDecision -t '{{ .reviewDecision }}') + echo "review=$review" >> $GITHUB_OUTPUT + echo "Review decision " $review + if [[ $prState == "MERGED" ]]; then + echo "PR already merged" + elif [[ $review == "APPROVED" ]]; then + echo "PR is approved and mergeStateStatus is " $mergeStateStatus + else + echo "No valid PR found for branch " ${{ env.BRANCH_NAME }} " in " ${{ matrix.submodule }} " merge is not allowed" + exit 1 + fi + env: + GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} + - name: Print outputs + if: steps.submoduleBranch.outputs.exist == 'true' + run: | + echo "Merge status " ${{ steps.PRCheck.outputs.mergeStateStatus }} + echo "PR REVIEW " ${{ steps.PRCheck.outputs.review }} + echo "PR url " ${{ steps.PRCheck.outputs.prurl }} + echo "PR state " ${{ steps.PRCheck.outputs.prState }} + - name: Remove label to allow merging of PR + if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') + run: | + cd submodule + gh label delete framework-pr + env: + GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} + - name: Merge PR + if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') + run: | + cd submodule + gh auth status + echo "actor " ${{ github.actor }} + gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{ steps.PRCheck.outputs.prurl }} + GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} From 52ed9d551f19d72a631aead1c5ba9f6eeb6e8ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:30:04 +0200 Subject: [PATCH 05/88] New action to check framework-pr label --- .github/actions/framework-pr-label/action.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/actions/framework-pr-label/action.yml diff --git a/.github/actions/framework-pr-label/action.yml b/.github/actions/framework-pr-label/action.yml new file mode 100644 index 000000000..d557bcff6 --- /dev/null +++ b/.github/actions/framework-pr-label/action.yml @@ -0,0 +1,16 @@ +name: "Check if framework-pr label is present in a PR" + +runs: + using: 'composite' + steps: + -name: Framework-pr label is present + if: contains(github.event.pull_request.labels.*.name, 'framework-pr') + run: | + echo "This PR can only be merged from framework" + exit 1 + shell: bash + -name: Framework-pr label is missing + if: !contains(github.event.pull_request.labels.*.name, 'framework-pr') + run: | + echo "This PR is able to be merged" + shell: bash From 399f693b1481d37f3143ee3c122842aa70d76a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 13:46:03 +0200 Subject: [PATCH 06/88] Bug fix --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 7ac443627..a0ad4ce62 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -21,7 +21,7 @@ jobs: submodule-pr: strategy: matrix: - submodule: ["rest-for-physics/rawlib", "rest-for-physics/detectorlib", "rest-for-physics/geant4lib","rest-for-physics/tracklib", "rest-for-physics/connectorslib", "rest-for-physics/axionlib", "rest-for-physics/legacylib", , "rest-for-physics/wimplib", "rest-for-physics/restG4"] + submodule: ["rest-for-physics/rawlib", "rest-for-physics/detectorlib", "rest-for-physics/geant4lib","rest-for-physics/tracklib", "rest-for-physics/connectorslib", "rest-for-physics/axionlib", "rest-for-physics/legacylib", "rest-for-physics/wimplib", "rest-for-physics/restG4"] runs-on: ubuntu-latest if: github.head_ref || github.ref_name != 'master' steps: From 226c8510fb3c51758691739b433c20ed015118c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 13:48:02 +0200 Subject: [PATCH 07/88] Removing extra name --- .github/workflows/automerge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index a0ad4ce62..8e85c1232 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,5 +1,4 @@ name: "Automatic PR checks and merge" -name: Check on submodules PR on: pull_request: From 553872470c8b9183a84f5dd54a1ce292e32b97a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:28:24 +0200 Subject: [PATCH 08/88] Adressing yaml format issues --- .github/actions/framework-pr-label/action.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/framework-pr-label/action.yml b/.github/actions/framework-pr-label/action.yml index d557bcff6..7836ef27d 100644 --- a/.github/actions/framework-pr-label/action.yml +++ b/.github/actions/framework-pr-label/action.yml @@ -3,14 +3,14 @@ name: "Check if framework-pr label is present in a PR" runs: using: 'composite' steps: - -name: Framework-pr label is present - if: contains(github.event.pull_request.labels.*.name, 'framework-pr') - run: | - echo "This PR can only be merged from framework" - exit 1 - shell: bash - -name: Framework-pr label is missing - if: !contains(github.event.pull_request.labels.*.name, 'framework-pr') - run: | - echo "This PR is able to be merged" - shell: bash + - name: Framework-pr label is present + if: contains(github.event.pull_request.labels.*.name, 'framework-pr') + run: | + echo "This PR can only be merged from framework" + exit 1 + shell: bash + - name: Framework-pr label is missing + if: !contains(github.event.pull_request.labels.*.name, 'framework-pr') + run: | + echo "This PR is able to be merged" + shell: bash From b975e4bfd7819d98486c233b0a1f30232f00e377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:32:39 +0200 Subject: [PATCH 09/88] Yaml formatting --- .github/actions/framework-pr-label/action.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/framework-pr-label/action.yml b/.github/actions/framework-pr-label/action.yml index 7836ef27d..c8c2e880d 100644 --- a/.github/actions/framework-pr-label/action.yml +++ b/.github/actions/framework-pr-label/action.yml @@ -3,14 +3,14 @@ name: "Check if framework-pr label is present in a PR" runs: using: 'composite' steps: - - name: Framework-pr label is present - if: contains(github.event.pull_request.labels.*.name, 'framework-pr') - run: | - echo "This PR can only be merged from framework" - exit 1 - shell: bash - - name: Framework-pr label is missing - if: !contains(github.event.pull_request.labels.*.name, 'framework-pr') - run: | - echo "This PR is able to be merged" - shell: bash + - name: Framework-pr label is present + if: contains(github.event.pull_request.labels.*.name, 'framework-pr') + run: | + echo "This PR can only be merged from framework" + exit 1 + shell: bash + - name: Framework-pr label is missing + if: !contains(github.event.pull_request.labels.*.name, 'framework-pr') + run: | + echo "This PR is able to be merged" + shell: bash From cc48ef19216c07a360ea79905cd0bcfa63c4290f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:48:26 +0200 Subject: [PATCH 10/88] Simplifiying output retreival --- .github/workflows/automerge.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 8e85c1232..1cbb8a8b3 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -53,16 +53,12 @@ jobs: #Check PR gh auth status gh pr view - prurl=$(gh pr view --json url -t '{{ .url }}') - echo "prurl=$prurl" >> $GITHUB_OUTPUT - mergeStateStatus=$(gh pr view --json mergeStateStatus -t '{{ .mergeStateStatus }}') - echo "MergeStateStatus " $mergeStateStatus - echo "mergeStateStatus=$mergeStateStatus" >> $GITHUB_OUTPUT - prState=$(gh pr view --json state -t '{{ .state }}') - echo "prState=$prState" >> $GITHUB_OUTPUT + echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT + echo "mergeStateStatus=$(gh pr view --json mergeStateStatus -t '{{ .mergeStateStatus }}')" >> $GITHUB_OUTPUT + echo "Merge state Status " $mergeStateStatus + echo "prState=$(gh pr view --json state -t '{{ .state }}')" >> $GITHUB_OUTPUT echo "PullRequestState " $prState - review=$(gh pr view --json reviewDecision -t '{{ .reviewDecision }}') - echo "review=$review" >> $GITHUB_OUTPUT + echo "review=$(gh pr view --json reviewDecision -t '{{ .reviewDecision }}')" >> $GITHUB_OUTPUT echo "Review decision " $review if [[ $prState == "MERGED" ]]; then echo "PR already merged" From 0c86be041eed99937a2bce9dc19f2e72d4746101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:59:01 +0200 Subject: [PATCH 11/88] Yalm formatting --- .github/actions/submodulePR/action.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 48f940e78..b9f9f5590 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -33,7 +33,7 @@ runs: echo "ref=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT shell: bash - name: Commit changes if branch exist - if: steps.frameworkBranch.outputs.ref == ${{ inputs.branch }} + if: steps.frameworkBranch.outputs.ref == ${{ inputs.branch }} run: | cd framework git submodule update --remote ${{ inputs.submodule }} @@ -41,7 +41,7 @@ runs: git push shell: bash - name: Commit changes to new branch - if: steps.frameworkBranch.outputs.ref == "master" + if: steps.frameworkBranch.outputs.ref == "master" run: | cd framework git submodule update --remote ${{ inputs.submodule }} @@ -50,22 +50,22 @@ runs: git push --set-upstream origin ${{ inputs.branch }} shell: bash - name: Checkout submodule - if: steps.frameworkBranch.outputs.ref == "master" + if: steps.frameworkBranch.outputs.ref == "master" uses: actions/checkout@v3 with: ref: ${{ inputs.branch }} path: submodule - name: Check submodule PR id: PRCheck - run: | - cd submodule - #Check PR - gh auth status - gh pr view - prurl=$(gh pr view --json url -t '{{ .url }}') - echo "prurl=$prurl" >> $GITHUB_OUTPUT - #Create label for further usage - gh label create framework-pr --description "This PR has to be merged from framework" --color E99695 + run: | + cd submodule + #Check PR + gh auth status + gh pr view + prurl=$(gh pr view --json url -t '{{ .url }}') + echo "prurl=$prurl" >> $GITHUB_OUTPUT + #Create label for further usage + gh label create framework-pr --description "This PR has to be merged from framework" --color E99695 env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash From ce137bf6d0735b2bc38e498c895fa2a332304fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:05:42 +0200 Subject: [PATCH 12/88] Adding quotatition to condition --- .github/actions/framework-pr-label/action.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/framework-pr-label/action.yml b/.github/actions/framework-pr-label/action.yml index c8c2e880d..e57565290 100644 --- a/.github/actions/framework-pr-label/action.yml +++ b/.github/actions/framework-pr-label/action.yml @@ -3,14 +3,14 @@ name: "Check if framework-pr label is present in a PR" runs: using: 'composite' steps: - - name: Framework-pr label is present - if: contains(github.event.pull_request.labels.*.name, 'framework-pr') - run: | - echo "This PR can only be merged from framework" - exit 1 - shell: bash - - name: Framework-pr label is missing - if: !contains(github.event.pull_request.labels.*.name, 'framework-pr') - run: | - echo "This PR is able to be merged" - shell: bash + - name: Framework-pr label is present + if: "contains(github.event.pull_request.labels.*.name, 'framework-pr')" + run: | + echo "This PR can only be merged from framework" + exit 1 + shell: bash + - name: Framework-pr label is missing + if: "!contains(github.event.pull_request.labels.*.name, 'framework-pr')" + run: | + echo "This PR is able to be merged" + shell: bash From 550b7469ec69247b93fd224d8b88b26e69a5c9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:49:15 +0200 Subject: [PATCH 13/88] Adressing quotation in `if` --- .github/actions/submodulePR/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index b9f9f5590..ee8dc00d3 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -41,7 +41,7 @@ runs: git push shell: bash - name: Commit changes to new branch - if: steps.frameworkBranch.outputs.ref == "master" + if: steps.frameworkBranch.outputs.ref == 'master' run: | cd framework git submodule update --remote ${{ inputs.submodule }} @@ -50,7 +50,7 @@ runs: git push --set-upstream origin ${{ inputs.branch }} shell: bash - name: Checkout submodule - if: steps.frameworkBranch.outputs.ref == "master" + if: steps.frameworkBranch.outputs.ref == 'master' uses: actions/checkout@v3 with: ref: ${{ inputs.branch }} @@ -70,7 +70,7 @@ runs: GITHUB_TOKEN: ${{ inputs.token }} shell: bash - name: Create PR - if: steps.frameworkBranch.outputs.ref == "master" + if: steps.frameworkBranch.outputs.ref == 'master' run: | gh pr create -B master -H ${{ inputs.branch }} --title 'Submodule Updates from ${{ inputs.submodule }} branch ${{ inputs.branch }}' --body 'Automatic PR from ${{ inputs.submodule }} branch ${{ inputs.branch }}, related PR ${{ steps.PRCheck.outputs.prurl }}' env: From d10d5ac11c5e4472585badc25132c80a1ee866ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 18:06:10 +0200 Subject: [PATCH 14/88] Addressing typo in token --- .github/actions/submodulePR/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index ee8dc00d3..fe2cbecd0 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -16,7 +16,7 @@ runs: - name: Checkout framework repository uses: actions/checkout@v3 with: - token: ${{ inputs.github_token }} + token: ${{ inputs.token }} repository: rest-for-physics/framework ref: master path: framework From 5b54e740c91db8010c7225d5130896af6820af81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 20:59:41 +0200 Subject: [PATCH 15/88] Removing token at checkout tryint to address query of github user and mail --- .github/actions/submodulePR/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index fe2cbecd0..b92db720f 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -16,7 +16,6 @@ runs: - name: Checkout framework repository uses: actions/checkout@v3 with: - token: ${{ inputs.token }} repository: rest-for-physics/framework ref: master path: framework From 44bf0f6639e4dec8be1e460a0d88c6c78fd3186b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 21:07:28 +0200 Subject: [PATCH 16/88] Addint username and mail since seems probematic, re-implementing token at checkout --- .github/actions/submodulePR/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index b92db720f..1752cc51c 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -16,6 +16,7 @@ runs: - name: Checkout framework repository uses: actions/checkout@v3 with: + token: ${{ inputs.token }} repository: rest-for-physics/framework ref: master path: framework @@ -24,6 +25,8 @@ runs: cd framework ./scripts/checkoutRemoteBranch.sh ${{ inputs.branch }} python3 pull-submodules.py --force --dontask --latest:${{ inputs.branch }} + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ github.actor }}@users.noreply.github.com" shell: bash - name: Check if framework branch exist id: frameworkBranch From e984ade5236d202895465a607089f842741be171 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 28 Apr 2023 19:08:45 +0000 Subject: [PATCH 17/88] Updating submodule source/libraries/raw --- scripts/batch-scripts | 2 +- source/libraries/axion | 2 +- source/libraries/connectors | 2 +- source/libraries/detector | 2 +- source/libraries/geant4 | 2 +- source/libraries/legacy | 2 +- source/libraries/raw | 2 +- source/libraries/track | 2 +- source/libraries/wimp | 2 +- source/packages/restG4 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/batch-scripts b/scripts/batch-scripts index 8f8fa7f76..d1b472a40 160000 --- a/scripts/batch-scripts +++ b/scripts/batch-scripts @@ -1 +1 @@ -Subproject commit 8f8fa7f764388ea8233faa97e39ae2a724d5f0d9 +Subproject commit d1b472a40ce45b8239c9f7ff8e34b265593a3ce3 diff --git a/source/libraries/axion b/source/libraries/axion index 0b2704a02..2448f438b 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit 0b2704a02684a4af00d8fca3be5de1061717b13c +Subproject commit 2448f438b90c885b03807342e4b9cf9b98feaa67 diff --git a/source/libraries/connectors b/source/libraries/connectors index 4053c789e..94f05514d 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit 4053c789e53be296d934310c7d7631b3347236dd +Subproject commit 94f05514d2f44aa09b1b265eb22993a425fd918d diff --git a/source/libraries/detector b/source/libraries/detector index 53b99225e..2766a9b7c 160000 --- a/source/libraries/detector +++ b/source/libraries/detector @@ -1 +1 @@ -Subproject commit 53b99225ee31bcfe0b8d119a182a148b02e9ce4b +Subproject commit 2766a9b7c3194a47631c71b14e79e9a3ffee60c5 diff --git a/source/libraries/geant4 b/source/libraries/geant4 index ed8266d5e..b875da59b 160000 --- a/source/libraries/geant4 +++ b/source/libraries/geant4 @@ -1 +1 @@ -Subproject commit ed8266d5eb265ea5e7c01b6c95fac5f5a747bf30 +Subproject commit b875da59bc39a85f785f97f2adbf45252543b017 diff --git a/source/libraries/legacy b/source/libraries/legacy index 831424307..970e0c9f2 160000 --- a/source/libraries/legacy +++ b/source/libraries/legacy @@ -1 +1 @@ -Subproject commit 83142430760cb35c2b3c597b24c1d884a01c0fff +Subproject commit 970e0c9f25ad4c160adedcb14b648ec4cb2dd207 diff --git a/source/libraries/raw b/source/libraries/raw index 952c92d85..d5a1a4499 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 952c92d85d8d6fd47f3aeedc4357032ce3ab8ee8 +Subproject commit d5a1a4499e0c656276d5461e725272d0c73e81a6 diff --git a/source/libraries/track b/source/libraries/track index b7f0e27fa..d1c43ce18 160000 --- a/source/libraries/track +++ b/source/libraries/track @@ -1 +1 @@ -Subproject commit b7f0e27fa1e71ed81d7f96ff2566a98b7fa55d30 +Subproject commit d1c43ce1874bee2366ebd117d2011c3e10a17849 diff --git a/source/libraries/wimp b/source/libraries/wimp index 3c0933eec..82ffdad8b 160000 --- a/source/libraries/wimp +++ b/source/libraries/wimp @@ -1 +1 @@ -Subproject commit 3c0933eecb23a96624a2f61dbc259f04e297b016 +Subproject commit 82ffdad8b59ce6b026c1a708c8afe96839001e36 diff --git a/source/packages/restG4 b/source/packages/restG4 index a29c27d1d..a7610c702 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit a29c27d1d34331a2b40db6d2cad40c316bfc1870 +Subproject commit a7610c702d8b53154e8e49f0b80af97428079762 From c0b4729131c9265481560459340c93021ca2649e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 21:11:33 +0200 Subject: [PATCH 18/88] Addressing bug --- .github/actions/submodulePR/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 1752cc51c..f2220f74a 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -52,7 +52,6 @@ runs: git push --set-upstream origin ${{ inputs.branch }} shell: bash - name: Checkout submodule - if: steps.frameworkBranch.outputs.ref == 'master' uses: actions/checkout@v3 with: ref: ${{ inputs.branch }} From 1e838a6d05558256b0a828d19d4b8aad4398d3ea Mon Sep 17 00:00:00 2001 From: JuanAn Garcia Date: Fri, 28 Apr 2023 23:10:10 +0200 Subject: [PATCH 19/88] Revert "Updating submodule source/libraries/raw" This reverts commit e984ade5236d202895465a607089f842741be171. --- scripts/batch-scripts | 2 +- source/libraries/axion | 2 +- source/libraries/connectors | 2 +- source/libraries/detector | 2 +- source/libraries/geant4 | 2 +- source/libraries/legacy | 2 +- source/libraries/raw | 2 +- source/libraries/track | 2 +- source/libraries/wimp | 2 +- source/packages/restG4 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/batch-scripts b/scripts/batch-scripts index d1b472a40..8f8fa7f76 160000 --- a/scripts/batch-scripts +++ b/scripts/batch-scripts @@ -1 +1 @@ -Subproject commit d1b472a40ce45b8239c9f7ff8e34b265593a3ce3 +Subproject commit 8f8fa7f764388ea8233faa97e39ae2a724d5f0d9 diff --git a/source/libraries/axion b/source/libraries/axion index 2448f438b..0b2704a02 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit 2448f438b90c885b03807342e4b9cf9b98feaa67 +Subproject commit 0b2704a02684a4af00d8fca3be5de1061717b13c diff --git a/source/libraries/connectors b/source/libraries/connectors index 94f05514d..4053c789e 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit 94f05514d2f44aa09b1b265eb22993a425fd918d +Subproject commit 4053c789e53be296d934310c7d7631b3347236dd diff --git a/source/libraries/detector b/source/libraries/detector index 2766a9b7c..53b99225e 160000 --- a/source/libraries/detector +++ b/source/libraries/detector @@ -1 +1 @@ -Subproject commit 2766a9b7c3194a47631c71b14e79e9a3ffee60c5 +Subproject commit 53b99225ee31bcfe0b8d119a182a148b02e9ce4b diff --git a/source/libraries/geant4 b/source/libraries/geant4 index b875da59b..ed8266d5e 160000 --- a/source/libraries/geant4 +++ b/source/libraries/geant4 @@ -1 +1 @@ -Subproject commit b875da59bc39a85f785f97f2adbf45252543b017 +Subproject commit ed8266d5eb265ea5e7c01b6c95fac5f5a747bf30 diff --git a/source/libraries/legacy b/source/libraries/legacy index 970e0c9f2..831424307 160000 --- a/source/libraries/legacy +++ b/source/libraries/legacy @@ -1 +1 @@ -Subproject commit 970e0c9f25ad4c160adedcb14b648ec4cb2dd207 +Subproject commit 83142430760cb35c2b3c597b24c1d884a01c0fff diff --git a/source/libraries/raw b/source/libraries/raw index d5a1a4499..952c92d85 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit d5a1a4499e0c656276d5461e725272d0c73e81a6 +Subproject commit 952c92d85d8d6fd47f3aeedc4357032ce3ab8ee8 diff --git a/source/libraries/track b/source/libraries/track index d1c43ce18..b7f0e27fa 160000 --- a/source/libraries/track +++ b/source/libraries/track @@ -1 +1 @@ -Subproject commit d1c43ce1874bee2366ebd117d2011c3e10a17849 +Subproject commit b7f0e27fa1e71ed81d7f96ff2566a98b7fa55d30 diff --git a/source/libraries/wimp b/source/libraries/wimp index 82ffdad8b..3c0933eec 160000 --- a/source/libraries/wimp +++ b/source/libraries/wimp @@ -1 +1 @@ -Subproject commit 82ffdad8b59ce6b026c1a708c8afe96839001e36 +Subproject commit 3c0933eecb23a96624a2f61dbc259f04e297b016 diff --git a/source/packages/restG4 b/source/packages/restG4 index a7610c702..a29c27d1d 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit a7610c702d8b53154e8e49f0b80af97428079762 +Subproject commit a29c27d1d34331a2b40db6d2cad40c316bfc1870 From f35f310f5e53fa4297069866487de2567161f730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 23:42:52 +0200 Subject: [PATCH 20/88] Adding protection in case there are no changes to commit --- .github/actions/submodulePR/action.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index f2220f74a..0c029c66a 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -38,16 +38,21 @@ runs: if: steps.frameworkBranch.outputs.ref == ${{ inputs.branch }} run: | cd framework - git submodule update --remote ${{ inputs.submodule }} - git commit -am "Updating submodule ${{ inputs.submodule }}" - git push + git add ${{ inputs.submodule }} + var=$(git diff --cached) + if [[ -z $var ]]; then + echo "Nothing to commit" + else + git commit -am "Updating submodule ${{ inputs.submodule }}" + git push + fi shell: bash - name: Commit changes to new branch if: steps.frameworkBranch.outputs.ref == 'master' run: | cd framework - git submodule update --remote ${{ inputs.submodule }} git checkout -b ${{ inputs.branch }} + git add ${{ inputs.submodule }} git commit -am "Updating submodule ${{ inputs.submodule }}" git push --set-upstream origin ${{ inputs.branch }} shell: bash From 88504d63c1b3a3044b8505e44ca00bcd8a47314c Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 28 Apr 2023 21:45:24 +0000 Subject: [PATCH 21/88] Updating submodule source/libraries/raw --- scripts/batch-scripts | 2 +- source/libraries/axion | 2 +- source/libraries/connectors | 2 +- source/libraries/detector | 2 +- source/libraries/geant4 | 2 +- source/libraries/legacy | 2 +- source/libraries/raw | 2 +- source/libraries/track | 2 +- source/libraries/wimp | 2 +- source/packages/restG4 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/batch-scripts b/scripts/batch-scripts index 8f8fa7f76..d1b472a40 160000 --- a/scripts/batch-scripts +++ b/scripts/batch-scripts @@ -1 +1 @@ -Subproject commit 8f8fa7f764388ea8233faa97e39ae2a724d5f0d9 +Subproject commit d1b472a40ce45b8239c9f7ff8e34b265593a3ce3 diff --git a/source/libraries/axion b/source/libraries/axion index 0b2704a02..2448f438b 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit 0b2704a02684a4af00d8fca3be5de1061717b13c +Subproject commit 2448f438b90c885b03807342e4b9cf9b98feaa67 diff --git a/source/libraries/connectors b/source/libraries/connectors index 4053c789e..94f05514d 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit 4053c789e53be296d934310c7d7631b3347236dd +Subproject commit 94f05514d2f44aa09b1b265eb22993a425fd918d diff --git a/source/libraries/detector b/source/libraries/detector index 53b99225e..2766a9b7c 160000 --- a/source/libraries/detector +++ b/source/libraries/detector @@ -1 +1 @@ -Subproject commit 53b99225ee31bcfe0b8d119a182a148b02e9ce4b +Subproject commit 2766a9b7c3194a47631c71b14e79e9a3ffee60c5 diff --git a/source/libraries/geant4 b/source/libraries/geant4 index ed8266d5e..b875da59b 160000 --- a/source/libraries/geant4 +++ b/source/libraries/geant4 @@ -1 +1 @@ -Subproject commit ed8266d5eb265ea5e7c01b6c95fac5f5a747bf30 +Subproject commit b875da59bc39a85f785f97f2adbf45252543b017 diff --git a/source/libraries/legacy b/source/libraries/legacy index 831424307..970e0c9f2 160000 --- a/source/libraries/legacy +++ b/source/libraries/legacy @@ -1 +1 @@ -Subproject commit 83142430760cb35c2b3c597b24c1d884a01c0fff +Subproject commit 970e0c9f25ad4c160adedcb14b648ec4cb2dd207 diff --git a/source/libraries/raw b/source/libraries/raw index 952c92d85..348ca424f 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 952c92d85d8d6fd47f3aeedc4357032ce3ab8ee8 +Subproject commit 348ca424f269662ebcbd84da0cebe797902a1b31 diff --git a/source/libraries/track b/source/libraries/track index b7f0e27fa..d1c43ce18 160000 --- a/source/libraries/track +++ b/source/libraries/track @@ -1 +1 @@ -Subproject commit b7f0e27fa1e71ed81d7f96ff2566a98b7fa55d30 +Subproject commit d1c43ce1874bee2366ebd117d2011c3e10a17849 diff --git a/source/libraries/wimp b/source/libraries/wimp index 3c0933eec..82ffdad8b 160000 --- a/source/libraries/wimp +++ b/source/libraries/wimp @@ -1 +1 @@ -Subproject commit 3c0933eecb23a96624a2f61dbc259f04e297b016 +Subproject commit 82ffdad8b59ce6b026c1a708c8afe96839001e36 diff --git a/source/packages/restG4 b/source/packages/restG4 index a29c27d1d..a7610c702 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit a29c27d1d34331a2b40db6d2cad40c316bfc1870 +Subproject commit a7610c702d8b53154e8e49f0b80af97428079762 From e3d327bd56a7116137bb56e6433311ce71d3a786 Mon Sep 17 00:00:00 2001 From: JuanAn Garcia Date: Fri, 28 Apr 2023 23:47:04 +0200 Subject: [PATCH 22/88] Revert "Updating submodule source/libraries/raw" This reverts commit 88504d63c1b3a3044b8505e44ca00bcd8a47314c. --- scripts/batch-scripts | 2 +- source/libraries/axion | 2 +- source/libraries/connectors | 2 +- source/libraries/detector | 2 +- source/libraries/geant4 | 2 +- source/libraries/legacy | 2 +- source/libraries/raw | 2 +- source/libraries/track | 2 +- source/libraries/wimp | 2 +- source/packages/restG4 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/batch-scripts b/scripts/batch-scripts index d1b472a40..8f8fa7f76 160000 --- a/scripts/batch-scripts +++ b/scripts/batch-scripts @@ -1 +1 @@ -Subproject commit d1b472a40ce45b8239c9f7ff8e34b265593a3ce3 +Subproject commit 8f8fa7f764388ea8233faa97e39ae2a724d5f0d9 diff --git a/source/libraries/axion b/source/libraries/axion index 2448f438b..0b2704a02 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit 2448f438b90c885b03807342e4b9cf9b98feaa67 +Subproject commit 0b2704a02684a4af00d8fca3be5de1061717b13c diff --git a/source/libraries/connectors b/source/libraries/connectors index 94f05514d..4053c789e 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit 94f05514d2f44aa09b1b265eb22993a425fd918d +Subproject commit 4053c789e53be296d934310c7d7631b3347236dd diff --git a/source/libraries/detector b/source/libraries/detector index 2766a9b7c..53b99225e 160000 --- a/source/libraries/detector +++ b/source/libraries/detector @@ -1 +1 @@ -Subproject commit 2766a9b7c3194a47631c71b14e79e9a3ffee60c5 +Subproject commit 53b99225ee31bcfe0b8d119a182a148b02e9ce4b diff --git a/source/libraries/geant4 b/source/libraries/geant4 index b875da59b..ed8266d5e 160000 --- a/source/libraries/geant4 +++ b/source/libraries/geant4 @@ -1 +1 @@ -Subproject commit b875da59bc39a85f785f97f2adbf45252543b017 +Subproject commit ed8266d5eb265ea5e7c01b6c95fac5f5a747bf30 diff --git a/source/libraries/legacy b/source/libraries/legacy index 970e0c9f2..831424307 160000 --- a/source/libraries/legacy +++ b/source/libraries/legacy @@ -1 +1 @@ -Subproject commit 970e0c9f25ad4c160adedcb14b648ec4cb2dd207 +Subproject commit 83142430760cb35c2b3c597b24c1d884a01c0fff diff --git a/source/libraries/raw b/source/libraries/raw index 348ca424f..952c92d85 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 348ca424f269662ebcbd84da0cebe797902a1b31 +Subproject commit 952c92d85d8d6fd47f3aeedc4357032ce3ab8ee8 diff --git a/source/libraries/track b/source/libraries/track index d1c43ce18..b7f0e27fa 160000 --- a/source/libraries/track +++ b/source/libraries/track @@ -1 +1 @@ -Subproject commit d1c43ce1874bee2366ebd117d2011c3e10a17849 +Subproject commit b7f0e27fa1e71ed81d7f96ff2566a98b7fa55d30 diff --git a/source/libraries/wimp b/source/libraries/wimp index 82ffdad8b..3c0933eec 160000 --- a/source/libraries/wimp +++ b/source/libraries/wimp @@ -1 +1 @@ -Subproject commit 82ffdad8b59ce6b026c1a708c8afe96839001e36 +Subproject commit 3c0933eecb23a96624a2f61dbc259f04e297b016 diff --git a/source/packages/restG4 b/source/packages/restG4 index a7610c702..a29c27d1d 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit a7610c702d8b53154e8e49f0b80af97428079762 +Subproject commit a29c27d1d34331a2b40db6d2cad40c316bfc1870 From b9721c052b44e1338a5cc54709d708f60ad37349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 28 Apr 2023 23:48:51 +0200 Subject: [PATCH 23/88] Addressing bug at commit --- .github/actions/submodulePR/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 0c029c66a..e0d506756 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -43,7 +43,7 @@ runs: if [[ -z $var ]]; then echo "Nothing to commit" else - git commit -am "Updating submodule ${{ inputs.submodule }}" + git commit -m "Updating submodule ${{ inputs.submodule }}" git push fi shell: bash @@ -53,7 +53,7 @@ runs: cd framework git checkout -b ${{ inputs.branch }} git add ${{ inputs.submodule }} - git commit -am "Updating submodule ${{ inputs.submodule }}" + git commit -m "Updating submodule ${{ inputs.submodule }}" git push --set-upstream origin ${{ inputs.branch }} shell: bash - name: Checkout submodule @@ -78,6 +78,7 @@ runs: - name: Create PR if: steps.frameworkBranch.outputs.ref == 'master' run: | + cd framework gh pr create -B master -H ${{ inputs.branch }} --title 'Submodule Updates from ${{ inputs.submodule }} branch ${{ inputs.branch }}' --body 'Automatic PR from ${{ inputs.submodule }} branch ${{ inputs.branch }}, related PR ${{ steps.PRCheck.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.github_token }} From 0de4d7691cc3886f635d0a053c02fc0f96b31c97 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 28 Apr 2023 21:50:27 +0000 Subject: [PATCH 24/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 952c92d85..348ca424f 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 952c92d85d8d6fd47f3aeedc4357032ce3ab8ee8 +Subproject commit 348ca424f269662ebcbd84da0cebe797902a1b31 From ebb29fe44b8139c32533d97a02e9d505432a49ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 12:58:03 +0200 Subject: [PATCH 25/88] Addressing issue while adding the label --- .github/actions/submodulePR/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index e0d506756..f43d0ea72 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -70,8 +70,8 @@ runs: gh pr view prurl=$(gh pr view --json url -t '{{ .url }}') echo "prurl=$prurl" >> $GITHUB_OUTPUT - #Create label for further usage - gh label create framework-pr --description "This PR has to be merged from framework" --color E99695 + #Add framework-pr label + gh pr edit $prurl --add-label "framework-pr" env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash From 576aea905c8c1e0f367e094611366ba5a23aab59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 12:59:46 +0200 Subject: [PATCH 26/88] Proper impelmentation for removing the framework-pr label --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 1cbb8a8b3..4c0860f34 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -81,7 +81,7 @@ jobs: if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') run: | cd submodule - gh label delete framework-pr + gh pr edit ${{ steps.PRCheck.outputs.prurl }} --remove "framework-pr" env: GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} - name: Merge PR From 912f5b1fc515782a5fa1592a17ea63520cfec92b Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 11:11:37 +0000 Subject: [PATCH 27/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 348ca424f..a9577a880 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 348ca424f269662ebcbd84da0cebe797902a1b31 +Subproject commit a9577a8803fd743162d86636c86edd26039c227e From 077f5443211c90235b7b1209e84561be2791db4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 13:33:04 +0200 Subject: [PATCH 28/88] Adding generic action for label check, renamed actions/framework-pr-label to actions/pr-label --- .github/actions/framework-pr-label/action.yml | 16 -------------- .github/actions/pr-label/action.yml | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 .github/actions/framework-pr-label/action.yml create mode 100644 .github/actions/pr-label/action.yml diff --git a/.github/actions/framework-pr-label/action.yml b/.github/actions/framework-pr-label/action.yml deleted file mode 100644 index e57565290..000000000 --- a/.github/actions/framework-pr-label/action.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Check if framework-pr label is present in a PR" - -runs: - using: 'composite' - steps: - - name: Framework-pr label is present - if: "contains(github.event.pull_request.labels.*.name, 'framework-pr')" - run: | - echo "This PR can only be merged from framework" - exit 1 - shell: bash - - name: Framework-pr label is missing - if: "!contains(github.event.pull_request.labels.*.name, 'framework-pr')" - run: | - echo "This PR is able to be merged" - shell: bash diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml new file mode 100644 index 000000000..5965e02e7 --- /dev/null +++ b/.github/actions/pr-label/action.yml @@ -0,0 +1,21 @@ +name: "Check a particular label is present in a PR" +inputs: + label: + description: "Label to check" + required: true + submodule: + +runs: + using: 'composite' + steps: + - name: Framework-pr label is present + if: "contains(github.event.pull_request.labels.*.name, ${{ inputs.label }})" + run: | + echo "This PR can only be merged from framework" + exit 1 + shell: bash + - name: Framework-pr label is missing + if: "!contains(github.event.pull_request.labels.*.name, ${{ inputs.label }})" + run: | + echo "This PR is able to be merged" + shell: bash From 7672e9e06b5e8852cd055c7148a2123155f89aac Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 11:36:36 +0000 Subject: [PATCH 29/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index a9577a880..9d04c20ca 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit a9577a8803fd743162d86636c86edd26039c227e +Subproject commit 9d04c20ca1c3114a607df65275556634fe1bd198 From 1f94598b9a3b8d609fb77aba679d45ad00c993fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 13:39:23 +0200 Subject: [PATCH 30/88] Bug fix --- .github/actions/pr-label/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index 5965e02e7..ea9abe327 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -3,7 +3,6 @@ inputs: label: description: "Label to check" required: true - submodule: runs: using: 'composite' From 2f188c00a0c67166258518e1169c4bd42adae0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 13:55:00 +0200 Subject: [PATCH 31/88] Adding further debugging on submodule PR --- .github/workflows/automerge.yml | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 4c0860f34..d02dbda71 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -55,19 +55,8 @@ jobs: gh pr view echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT echo "mergeStateStatus=$(gh pr view --json mergeStateStatus -t '{{ .mergeStateStatus }}')" >> $GITHUB_OUTPUT - echo "Merge state Status " $mergeStateStatus echo "prState=$(gh pr view --json state -t '{{ .state }}')" >> $GITHUB_OUTPUT - echo "PullRequestState " $prState echo "review=$(gh pr view --json reviewDecision -t '{{ .reviewDecision }}')" >> $GITHUB_OUTPUT - echo "Review decision " $review - if [[ $prState == "MERGED" ]]; then - echo "PR already merged" - elif [[ $review == "APPROVED" ]]; then - echo "PR is approved and mergeStateStatus is " $mergeStateStatus - else - echo "No valid PR found for branch " ${{ env.BRANCH_NAME }} " in " ${{ matrix.submodule }} " merge is not allowed" - exit 1 - fi env: GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} - name: Print outputs @@ -77,14 +66,14 @@ jobs: echo "PR REVIEW " ${{ steps.PRCheck.outputs.review }} echo "PR url " ${{ steps.PRCheck.outputs.prurl }} echo "PR state " ${{ steps.PRCheck.outputs.prState }} - - name: Remove label to allow merging of PR - if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') - run: | - cd submodule - gh pr edit ${{ steps.PRCheck.outputs.prurl }} --remove "framework-pr" - env: - GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} - - name: Merge PR + if [[ ${{ steps.PRCheck.outputs.prState }} == "MERGED" ]]; then + echo "PR already merged" + elif [[ ${{ steps.PRCheck.outputs.review }} == "APPROVED" ]]; then + echo "PR is approved and mergeStateStatus is " $mergeStateStatus + else + echo "Not approved or invalid PR for branch " ${{ env.BRANCH_NAME }} " in " ${{ matrix.submodule }} " merge is not allowed" + exit 1 + fi if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') run: | cd submodule From 29bcb763f015b4aa5a588d8311c69b6d5d937ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 14:00:10 +0200 Subject: [PATCH 32/88] Fix after removal of some lines by mistake --- .github/workflows/automerge.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index d02dbda71..f13d568ba 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -74,6 +74,14 @@ jobs: echo "Not approved or invalid PR for branch " ${{ env.BRANCH_NAME }} " in " ${{ matrix.submodule }} " merge is not allowed" exit 1 fi + - name: Remove label to allow merging of PR + if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') + run: | + cd submodule + gh pr edit ${{ steps.PRCheck.outputs.prurl }} --remove "framework-pr" + env: + GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} + - name: Merge PR if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') run: | cd submodule From 3f212cd6f2fe911807f473f13b691d7a841df6b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:00:25 +0200 Subject: [PATCH 33/88] More generic handling of labels inside pr-label action --- .github/actions/pr-label/action.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index ea9abe327..258e37a68 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -1,20 +1,27 @@ -name: "Check a particular label is present in a PR" +name: "Check if a particular label is present in a PR" inputs: label: description: "Label to check" required: true +outputs: + label-is-present: + description: "Return true or false if the label is present" + value: ${{ steps.label.outputs.exist }} runs: using: 'composite' steps: - - name: Framework-pr label is present - if: "contains(github.event.pull_request.labels.*.name, ${{ inputs.label }})" + - name: Label is present + id: label + echo "${{ github.event.pull_request.labels.*.name }}" + id: label run: | - echo "This PR can only be merged from framework" - exit 1 - shell: bash - - name: Framework-pr label is missing - if: "!contains(github.event.pull_request.labels.*.name, ${{ inputs.label }})" - run: | - echo "This PR is able to be merged" + prlabel=${{ github.event.pull_request.labels.*.name }} + if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then + echo "Label " ${{ inputs.label }} "is present " + echo "exist=true" >> $GITHUB_OUTPUT + elif + echo "Label " ${{ inputs.label }} "is missing " + echo "exist=false" >> $GITHUB_OUTPUT + fi shell: bash From a3c2cbf5895dbcae9376db8096ebdeaf35898551 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 16:10:07 +0000 Subject: [PATCH 34/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 9d04c20ca..76a5f643c 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 9d04c20ca1c3114a607df65275556634fe1bd198 +Subproject commit 76a5f643cdf2a4d46eded30f94329d73239b329b From b50675e49aa641db56f0923fb902f1fc3e5d2d06 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 16:12:53 +0000 Subject: [PATCH 35/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 76a5f643c..7af3b8dd7 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 76a5f643cdf2a4d46eded30f94329d73239b329b +Subproject commit 7af3b8dd7b4471f59502427c1c7fc03423466daa From d7b5aac89e6cc5e3c2d6eb14c357dad5c7ece776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:14:38 +0200 Subject: [PATCH 36/88] Bug fix --- .github/actions/pr-label/action.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index 258e37a68..1b0f803a7 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -6,15 +6,13 @@ inputs: outputs: label-is-present: description: "Return true or false if the label is present" - value: ${{ steps.label.outputs.exist }} + value: ${{ steps.label-check.outputs.exist }} runs: using: 'composite' steps: - name: Label is present - id: label - echo "${{ github.event.pull_request.labels.*.name }}" - id: label + id: label-check run: | prlabel=${{ github.event.pull_request.labels.*.name }} if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then From f760719709937619e39d566c71fad90a3a7139a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:16:21 +0200 Subject: [PATCH 37/88] Bug fix --- .github/actions/pr-label/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index 1b0f803a7..cbec32006 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -18,7 +18,7 @@ runs: if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then echo "Label " ${{ inputs.label }} "is present " echo "exist=true" >> $GITHUB_OUTPUT - elif + else echo "Label " ${{ inputs.label }} "is missing " echo "exist=false" >> $GITHUB_OUTPUT fi From 84f6686e2c89ef7c3b201093f9ba9b136ab2b88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:20:20 +0200 Subject: [PATCH 38/88] Adding debug --- .github/actions/pr-label/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index cbec32006..5696ec096 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -15,6 +15,8 @@ runs: id: label-check run: | prlabel=${{ github.event.pull_request.labels.*.name }} + echo "Label " ${{ github.event.pull_request.labels.*.name }} + echo "PRlabel ${prlabel[*]}" if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then echo "Label " ${{ inputs.label }} "is present " echo "exist=true" >> $GITHUB_OUTPUT From c3c23c5ac6f6a928ae2afca0906db74e62ff4ab4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 29 Apr 2023 16:20:35 +0000 Subject: [PATCH 39/88] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/actions/pr-label/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index 5696ec096..d616d9e47 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -16,7 +16,7 @@ runs: run: | prlabel=${{ github.event.pull_request.labels.*.name }} echo "Label " ${{ github.event.pull_request.labels.*.name }} - echo "PRlabel ${prlabel[*]}" + echo "PRlabel ${prlabel[*]}" if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then echo "Label " ${{ inputs.label }} "is present " echo "exist=true" >> $GITHUB_OUTPUT From e474db510f25f70581098cde7ec5a64253a0c059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:23:50 +0200 Subject: [PATCH 40/88] Using fromJSON to check labels on PR --- .github/actions/pr-label/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml index d616d9e47..ff0374e14 100644 --- a/.github/actions/pr-label/action.yml +++ b/.github/actions/pr-label/action.yml @@ -14,7 +14,7 @@ runs: - name: Label is present id: label-check run: | - prlabel=${{ github.event.pull_request.labels.*.name }} + prlabel=${{ fromJSON(github.event.pull_request.labels.*.name) }} echo "Label " ${{ github.event.pull_request.labels.*.name }} echo "PRlabel ${prlabel[*]}" if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then From 6fab240f5d4d5aef5eb899ab4378d979e49d25d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:35:13 +0200 Subject: [PATCH 41/88] Delete pr-label action since it is an overkill --- .github/actions/pr-label/action.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/actions/pr-label/action.yml diff --git a/.github/actions/pr-label/action.yml b/.github/actions/pr-label/action.yml deleted file mode 100644 index ff0374e14..000000000 --- a/.github/actions/pr-label/action.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: "Check if a particular label is present in a PR" -inputs: - label: - description: "Label to check" - required: true -outputs: - label-is-present: - description: "Return true or false if the label is present" - value: ${{ steps.label-check.outputs.exist }} - -runs: - using: 'composite' - steps: - - name: Label is present - id: label-check - run: | - prlabel=${{ fromJSON(github.event.pull_request.labels.*.name) }} - echo "Label " ${{ github.event.pull_request.labels.*.name }} - echo "PRlabel ${prlabel[*]}" - if [[ " ${prlabel[*]} " =~ ${{ inputs.label }} ]]; then - echo "Label " ${{ inputs.label }} "is present " - echo "exist=true" >> $GITHUB_OUTPUT - else - echo "Label " ${{ inputs.label }} "is missing " - echo "exist=false" >> $GITHUB_OUTPUT - fi - shell: bash From 37ee0fe40e739e042f6923b390e8af2f98546032 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 16:37:57 +0000 Subject: [PATCH 42/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 7af3b8dd7..71d8672a2 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 7af3b8dd7b4471f59502427c1c7fc03423466daa +Subproject commit 71d8672a257cfb04bcb14091a4236052f9ed06ad From 0752a5ccccc77c15d903f4a89a5a1fec1b61e7c6 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 16:42:08 +0000 Subject: [PATCH 43/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 71d8672a2..3eb653292 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 71d8672a257cfb04bcb14091a4236052f9ed06ad +Subproject commit 3eb6532920a2aa3f325277629343950815e53ae3 From 64c29a5d41dd28d3d51e4ecbfe4c1251d25350f4 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 16:44:39 +0000 Subject: [PATCH 44/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 3eb653292..1154464d3 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 3eb6532920a2aa3f325277629343950815e53ae3 +Subproject commit 1154464d3723555f426b7a07971d70af7ef48920 From ebc4c9c8bb23e409dd291e6e3c80cf5de19d36e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 20:18:16 +0200 Subject: [PATCH 45/88] Improving submodulePR action, now a PR is created in framework even if the branch already exist, adding framework PR url to submodule PR body --- .github/actions/submodulePR/action.yml | 29 +++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index f43d0ea72..93aca24a8 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -62,24 +62,43 @@ runs: ref: ${{ inputs.branch }} path: submodule - name: Check submodule PR - id: PRCheck + id: submodulePR run: | cd submodule - #Check PR + #Check submodule PR gh auth status gh pr view prurl=$(gh pr view --json url -t '{{ .url }}') echo "prurl=$prurl" >> $GITHUB_OUTPUT + echo "body=$(gh pr view --json body -t '{{ .body }}')" >> $GITHUB_OUTPUT #Add framework-pr label gh pr edit $prurl --add-label "framework-pr" env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash - - name: Create PR - if: steps.frameworkBranch.outputs.ref == 'master' + - name: Check framework PR + id: frameworkPR run: | cd framework - gh pr create -B master -H ${{ inputs.branch }} --title 'Submodule Updates from ${{ inputs.submodule }} branch ${{ inputs.branch }}' --body 'Automatic PR from ${{ inputs.submodule }} branch ${{ inputs.branch }}, related PR ${{ steps.PRCheck.outputs.prurl }}' + #Check framework PR + gh pr view + echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT + env: + GITHUB_TOKEN: ${{ inputs.token }} + shell: bash + - name: Create PR in framework + if: "steps.frameworkBranch.outputs.ref == 'master' || steps.frameworkPR.outputs.prurl == ''" + run: | + cd framework + gh pr create -B master -H ${{ inputs.branch }} --title 'Submodule Updates from ${{ inputs.submodule }} branch ${{ inputs.branch }}' --body 'Automatic PR from ${{ inputs.submodule }} branch ${{ inputs.branch }}, related PR ${{ steps.submodulePR.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash + - name: Update submodule PR body + if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" + run: | + cd framework + gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} \n Related framework PR "${{ steps.frameworkPR.outputs.prurl }}" + env: + GITHUB_TOKEN: ${{ inputs.github_token }} + shell: bash From 3add7d0ddfa0b1bb83447ae2a56599d750cfe1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 20:22:58 +0200 Subject: [PATCH 46/88] Yaml format --- .github/actions/submodulePR/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 93aca24a8..54af37a04 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -100,5 +100,5 @@ runs: cd framework gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} \n Related framework PR "${{ steps.frameworkPR.outputs.prurl }}" env: - GITHUB_TOKEN: ${{ inputs.github_token }} + GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash From 0b7ee12d96722a444f792330bae75cee5d63eaa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 20:28:09 +0200 Subject: [PATCH 47/88] Yaml format --- .github/actions/submodulePR/action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 54af37a04..be78a16a7 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -94,11 +94,11 @@ runs: env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash - - name: Update submodule PR body - if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" - run: | - cd framework - gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} \n Related framework PR "${{ steps.frameworkPR.outputs.prurl }}" - env: - GITHUB_TOKEN: ${{ inputs.github_token }} - shell: bash + - name: Update submodule PR body + if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" + run: | + cd framework + gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} \n Related framework PR "${{ steps.frameworkPR.outputs.prurl }}" + env: + GITHUB_TOKEN: ${{ inputs.github_token }} + shell: bash From 0a8e5cd198d95e8f34be426def9081a7be1144e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 20:39:05 +0200 Subject: [PATCH 48/88] Trying to address issues while getting PR body --- .github/actions/submodulePR/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index be78a16a7..c83a1b35a 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -70,7 +70,7 @@ runs: gh pr view prurl=$(gh pr view --json url -t '{{ .url }}') echo "prurl=$prurl" >> $GITHUB_OUTPUT - echo "body=$(gh pr view --json body -t '{{ .body }}')" >> $GITHUB_OUTPUT + echo -e "body<> $GITHUB_OUTPUT #Add framework-pr label gh pr edit $prurl --add-label "framework-pr" env: From ee88680119538edccc4ac93147d49cdd3ef57782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 20:48:39 +0200 Subject: [PATCH 49/88] Adding possibility to add a label to the framework PR --- .github/actions/submodulePR/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index c83a1b35a..f8293a242 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -6,6 +6,8 @@ inputs: submodule: description: "Relative path to the submodule" required: true + label: + description: "Add the following label to the submodule PR" token: description: "Authentification token" required: true @@ -83,6 +85,8 @@ runs: #Check framework PR gh pr view echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT + #Add custom label + gh pr edit $prurl --add-label ${{ inputs.label }} env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash From cb976d77d1b01c87e3156551a67d333d4b513d06 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 18:53:28 +0000 Subject: [PATCH 50/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 1154464d3..e5a2ff640 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 1154464d3723555f426b7a07971d70af7ef48920 +Subproject commit e5a2ff640e9161239d126760f38c50673811bde4 From d7863b7369f66eba2f6577740b2717ed1f581c88 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 18:58:28 +0000 Subject: [PATCH 51/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index e5a2ff640..16feb5364 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit e5a2ff640e9161239d126760f38c50673811bde4 +Subproject commit 16feb536413bd939c4ee0738031260424ea23ad3 From 4f7382943bcd0d207bf8a1f9a670ba1535207d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 21:54:07 +0200 Subject: [PATCH 52/88] Adding concurrency in automerge workflow --- .github/workflows/automerge.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f13d568ba..69090caa0 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -3,10 +3,14 @@ name: "Automatic PR checks and merge" on: pull_request: branches: [ "master" ] - types: [ "opened", "reopened", "created", "closed", "synchronize"] + types: [ "opened", "reopened", "created", "closed", "synchronize", "labeled", "unlabeled"] workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + #permissions: write-all env: From 95ac314ca35cdb2a63016f7eeb30c6a4ffaf9efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Sat, 29 Apr 2023 21:56:13 +0200 Subject: [PATCH 53/88] Yaml formatting --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 69090caa0..b8a886ef4 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -3,7 +3,7 @@ name: "Automatic PR checks and merge" on: pull_request: branches: [ "master" ] - types: [ "opened", "reopened", "created", "closed", "synchronize", "labeled", "unlabeled"] + types: [ "opened", "reopened", "created", "closed", "synchronize", "labeled", "unlabeled"] workflow_dispatch: From 35c7785c31503c361a1e036343b2a93835f272d8 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 20:01:13 +0000 Subject: [PATCH 54/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 16feb5364..2d59cdc85 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 16feb536413bd939c4ee0738031260424ea23ad3 +Subproject commit 2d59cdc85d44ee27d9c592b927eca74b5a6b1ece From 1453adcb2506c6a3926188306adb94d2ccbf95f3 Mon Sep 17 00:00:00 2001 From: juanangp Date: Sat, 29 Apr 2023 20:30:30 +0000 Subject: [PATCH 55/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index 2d59cdc85..e5b2efdad 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit 2d59cdc85d44ee27d9c592b927eca74b5a6b1ece +Subproject commit e5b2efdadf8af29d310ad1a77fa8539bed78e323 From c85ba822548c775f10962bc548263d7705b05ccb Mon Sep 17 00:00:00 2001 From: juanangp Date: Tue, 9 May 2023 08:57:26 +0000 Subject: [PATCH 56/88] Updating submodule source/libraries/detector --- source/libraries/detector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/detector b/source/libraries/detector index 53b99225e..cb6d71acb 160000 --- a/source/libraries/detector +++ b/source/libraries/detector @@ -1 +1 @@ -Subproject commit 53b99225ee31bcfe0b8d119a182a148b02e9ce4b +Subproject commit cb6d71acbb686f944909711bb447351d28a6f02f From 4ad3a4e5aca67c3c4efc596b41dd4f6e1147a022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Tue, 9 May 2023 11:36:38 +0200 Subject: [PATCH 57/88] Deactivating fail-fast since all the submodules should be checked independently --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index b8a886ef4..d35e5b8cd 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -23,6 +23,7 @@ defaults: jobs: submodule-pr: strategy: + fail-fast: false matrix: submodule: ["rest-for-physics/rawlib", "rest-for-physics/detectorlib", "rest-for-physics/geant4lib","rest-for-physics/tracklib", "rest-for-physics/connectorslib", "rest-for-physics/axionlib", "rest-for-physics/legacylib", "rest-for-physics/wimplib", "rest-for-physics/restG4"] runs-on: ubuntu-latest From 8da49a7a7f9349112e7b4359c01574395fb40c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 17:54:59 +0200 Subject: [PATCH 58/88] Simplying step for merging a submodule PR --- .github/workflows/automerge.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index d35e5b8cd..1ba38f2f8 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -79,17 +79,10 @@ jobs: echo "Not approved or invalid PR for branch " ${{ env.BRANCH_NAME }} " in " ${{ matrix.submodule }} " merge is not allowed" exit 1 fi - - name: Remove label to allow merging of PR - if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') - run: | - cd submodule - gh pr edit ${{ steps.PRCheck.outputs.prurl }} --remove "framework-pr" - env: - GITHUB_TOKEN: ${{ secrets.REST_TOKEN }} - name: Merge PR if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') - run: | cd submodule + gh pr edit ${{ steps.PRCheck.outputs.prurl }} --remove "framework-pr" gh auth status echo "actor " ${{ github.actor }} gh pr merge --auto --merge "$PR_URL" From 4d764dd19b700840defa06de4b351e28f76c544e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 17:58:25 +0200 Subject: [PATCH 59/88] Bug fix --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 1ba38f2f8..e24d329ba 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -81,6 +81,7 @@ jobs: fi - name: Merge PR if: (github.event.action == 'closed' && github.event.pull_request.merged == true && steps.PRCheck.outputs.review == 'APPROVED' && steps.PRCheck.outputs.prState != 'MERGED') + run: | cd submodule gh pr edit ${{ steps.PRCheck.outputs.prurl }} --remove "framework-pr" gh auth status From 1295e4c9c9a7944dd07316841ee84a6884bcb505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 18:12:51 +0200 Subject: [PATCH 60/88] Adding submodule PR url in framework PR body in case is not present --- .github/actions/submodulePR/action.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index f8293a242..dca8566ac 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -85,6 +85,7 @@ runs: #Check framework PR gh pr view echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT + echo -e "body<> $GITHUB_OUTPUT #Add custom label gh pr edit $prurl --add-label ${{ inputs.label }} env: @@ -101,8 +102,16 @@ runs: - name: Update submodule PR body if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" run: | - cd framework + cd submodule gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} \n Related framework PR "${{ steps.frameworkPR.outputs.prurl }}" env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash + - name: Update framework PR body + if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.frameworkPR.outputs.body, steps.submodulePR.outputs.prurl)" + run: | + cd framework + gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "${{ steps.frameworkPR.outputs.body }} \n Related PR "${{ steps.submodulePR.outputs.prurl }}" + env: + GITHUB_TOKEN: ${{ inputs.github_token }} + shell: bash From 2aed579bc3ea44919a7dbd99ce0900544cae8108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 18:33:47 +0200 Subject: [PATCH 61/88] Trying to address issues while editing PR body --- .github/actions/submodulePR/action.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index dca8566ac..eb5a5eb4f 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -85,7 +85,7 @@ runs: #Check framework PR gh pr view echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT - echo -e "body<> $GITHUB_OUTPUT + echo -e "body<> $GITHUB_OUTPUT #Add custom label gh pr edit $prurl --add-label ${{ inputs.label }} env: @@ -103,7 +103,8 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" run: | cd submodule - gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} \n Related framework PR "${{ steps.frameworkPR.outputs.prurl }}" + echo -e "${{ steps.submodulePR.outputs.body }}\nRelated framework PR ${{ steps.frameworkPR.outputs.prurl }}" > msg + gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "$msg" env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash @@ -111,7 +112,8 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.frameworkPR.outputs.body, steps.submodulePR.outputs.prurl)" run: | cd framework - gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "${{ steps.frameworkPR.outputs.body }} \n Related PR "${{ steps.submodulePR.outputs.prurl }}" + echo -e "${{ steps.frameworkPR.outputs.body }}\nRelated PR ${{ steps.submodulePR.outputs.prurl }}" > msg + gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "$msg" env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash From 0b8f985743e46a3746f9af91c47250294f53c950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 18:39:46 +0200 Subject: [PATCH 62/88] Trying to fix issue while writting PR body --- .github/actions/submodulePR/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index eb5a5eb4f..274399267 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -104,6 +104,7 @@ runs: run: | cd submodule echo -e "${{ steps.submodulePR.outputs.body }}\nRelated framework PR ${{ steps.frameworkPR.outputs.prurl }}" > msg + export msg=$(cat msg) gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "$msg" env: GITHUB_TOKEN: ${{ inputs.github_token }} @@ -113,6 +114,7 @@ runs: run: | cd framework echo -e "${{ steps.frameworkPR.outputs.body }}\nRelated PR ${{ steps.submodulePR.outputs.prurl }}" > msg + export msg=$(cat msg) gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "$msg" env: GITHUB_TOKEN: ${{ inputs.github_token }} From df51f7f6a3b6ab10fdac472eb381b8a75aece065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 18:45:54 +0200 Subject: [PATCH 63/88] Avoid use of return while editing PR body, seems overcomplicated --- .github/actions/submodulePR/action.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 274399267..3269346f5 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -103,9 +103,7 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" run: | cd submodule - echo -e "${{ steps.submodulePR.outputs.body }}\nRelated framework PR ${{ steps.frameworkPR.outputs.prurl }}" > msg - export msg=$(cat msg) - gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "$msg" + gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.frameworkPR.outputs.prurl }}" env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash @@ -113,9 +111,7 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.frameworkPR.outputs.body, steps.submodulePR.outputs.prurl)" run: | cd framework - echo -e "${{ steps.frameworkPR.outputs.body }}\nRelated PR ${{ steps.submodulePR.outputs.prurl }}" > msg - export msg=$(cat msg) - gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "$msg" + gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "${{ steps.frameworkPR.outputs.body }} Related PR ${{ steps.submodulePR.outputs.prurl }}" env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash From ad07d0766af4a89560c6e0e2d3856dc2261d6fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 18:53:09 +0200 Subject: [PATCH 64/88] Attempting to address submodule pipeline issue --- .github/actions/submodulePR/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 3269346f5..133fd7dbd 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -103,7 +103,7 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" run: | cd submodule - gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body "${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.frameworkPR.outputs.prurl }}" + gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body '${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.frameworkPR.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash @@ -111,7 +111,7 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.frameworkPR.outputs.body, steps.submodulePR.outputs.prurl)" run: | cd framework - gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body "${{ steps.frameworkPR.outputs.body }} Related PR ${{ steps.submodulePR.outputs.prurl }}" + gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body '${{ steps.frameworkPR.outputs.body }} Related PR ${{ steps.submodulePR.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash From 9a0ca669d963c65aa9f1536377c4331b157adc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 18:55:26 +0200 Subject: [PATCH 65/88] Addressing token issues --- .github/actions/submodulePR/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 133fd7dbd..b6ed051a9 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -97,7 +97,7 @@ runs: cd framework gh pr create -B master -H ${{ inputs.branch }} --title 'Submodule Updates from ${{ inputs.submodule }} branch ${{ inputs.branch }}' --body 'Automatic PR from ${{ inputs.submodule }} branch ${{ inputs.branch }}, related PR ${{ steps.submodulePR.outputs.prurl }}' env: - GITHUB_TOKEN: ${{ inputs.github_token }} + GITHUB_TOKEN: ${{ inputs.token }} shell: bash - name: Update submodule PR body if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" @@ -105,7 +105,7 @@ runs: cd submodule gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body '${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.frameworkPR.outputs.prurl }}' env: - GITHUB_TOKEN: ${{ inputs.github_token }} + GITHUB_TOKEN: ${{ inputs.token }} shell: bash - name: Update framework PR body if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.frameworkPR.outputs.body, steps.submodulePR.outputs.prurl)" From 5f6d0738cdd0961b532c85074a954ba0351b62bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 19:20:03 +0200 Subject: [PATCH 66/88] Addressing corner case in case branch exist but no PR have been issued --- .github/actions/submodulePR/action.yml | 28 ++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index b6ed051a9..12ec5830b 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -82,12 +82,9 @@ runs: id: frameworkPR run: | cd framework + gh auth status #Check framework PR - gh pr view echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT - echo -e "body<> $GITHUB_OUTPUT - #Add custom label - gh pr edit $prurl --add-label ${{ inputs.label }} env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash @@ -99,19 +96,34 @@ runs: env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash + - name: Second check on framework PR + id: PRFramework + run: | + cd framework + #Check framework PR + gh pr view + echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT + echo -e "body<> $GITHUB_OUTPUT + #Add custom label + gh pr edit $prurl --add-label ${{ inputs.label }} + env: + GITHUB_TOKEN: ${{ inputs.token }} + shell: bash - name: Update submodule PR body - if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.frameworkPR.outputs.prurl)" + if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.PRFramework.outputs.prurl)" run: | cd submodule - gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body '${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.frameworkPR.outputs.prurl }}' + gh auth status + gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body '${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.PRFramework.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.token }} shell: bash - name: Update framework PR body - if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.frameworkPR.outputs.body, steps.submodulePR.outputs.prurl)" + if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.PRFramework.outputs.body, steps.submodulePR.outputs.prurl)" run: | cd framework - gh pr edit ${{ steps.frameworkPR.outputs.prurl }} --body '${{ steps.frameworkPR.outputs.body }} Related PR ${{ steps.submodulePR.outputs.prurl }}' + gh auth status + gh pr edit ${{ steps.PRFramework.outputs.prurl }} --body '${{ steps.PRFramework.outputs.body }} Related PR ${{ steps.submodulePR.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.github_token }} shell: bash From f465d059af7863d94a52ebd3fed222bd4f7896e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 12 May 2023 19:26:26 +0200 Subject: [PATCH 67/88] Adressing token issue --- .github/actions/submodulePR/action.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index 12ec5830b..c3580035d 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -82,7 +82,6 @@ runs: id: frameworkPR run: | cd framework - gh auth status #Check framework PR echo "prurl=$(gh pr view --json url -t '{{ .url }}')" >> $GITHUB_OUTPUT env: @@ -113,7 +112,6 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.submodulePR.outputs.body, steps.PRFramework.outputs.prurl)" run: | cd submodule - gh auth status gh pr edit ${{ steps.submodulePR.outputs.prurl }} --body '${{ steps.submodulePR.outputs.body }} Related framework PR ${{ steps.PRFramework.outputs.prurl }}' env: GITHUB_TOKEN: ${{ inputs.token }} @@ -122,8 +120,7 @@ runs: if: "steps.frameworkBranch.outputs.ref != 'master' && !contains(steps.PRFramework.outputs.body, steps.submodulePR.outputs.prurl)" run: | cd framework - gh auth status gh pr edit ${{ steps.PRFramework.outputs.prurl }} --body '${{ steps.PRFramework.outputs.body }} Related PR ${{ steps.submodulePR.outputs.prurl }}' env: - GITHUB_TOKEN: ${{ inputs.github_token }} + GITHUB_TOKEN: ${{ inputs.token }} shell: bash From bef952a8b71f210c8cf7ec11864e9d0e4ed64dae Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 12 May 2023 17:46:56 +0000 Subject: [PATCH 68/88] Updating submodule source/libraries/geant4 --- source/libraries/geant4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/geant4 b/source/libraries/geant4 index ed8266d5e..ff353aa9e 160000 --- a/source/libraries/geant4 +++ b/source/libraries/geant4 @@ -1 +1 @@ -Subproject commit ed8266d5eb265ea5e7c01b6c95fac5f5a747bf30 +Subproject commit ff353aa9ea1d04c43c23f59c49e5d84b86b1bd46 From 4d063448bda67044253527fb780277051fd2f3c7 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 12 May 2023 18:38:48 +0000 Subject: [PATCH 69/88] Updating submodule source/libraries/track --- source/libraries/track | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/track b/source/libraries/track index b7f0e27fa..87fd3771c 160000 --- a/source/libraries/track +++ b/source/libraries/track @@ -1 +1 @@ -Subproject commit b7f0e27fa1e71ed81d7f96ff2566a98b7fa55d30 +Subproject commit 87fd3771cae5ed1f8babb4dfc897216396012dc6 From 9a40755f60fe9814f2f3939fe56a116b53ac8205 Mon Sep 17 00:00:00 2001 From: juanangp Date: Mon, 15 May 2023 08:08:14 +0000 Subject: [PATCH 70/88] Updating submodule source/libraries/connectors --- source/libraries/connectors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/connectors b/source/libraries/connectors index 4053c789e..1838f24dc 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit 4053c789e53be296d934310c7d7631b3347236dd +Subproject commit 1838f24dcc677a44b0d803e4604a93e1b671bf14 From 988366cb8beee0dcab2211eccfaa4d176ed7878e Mon Sep 17 00:00:00 2001 From: juanangp Date: Mon, 15 May 2023 08:10:55 +0000 Subject: [PATCH 71/88] Updating submodule source/libraries/connectors --- source/libraries/connectors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/connectors b/source/libraries/connectors index 1838f24dc..bd91ef344 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit 1838f24dcc677a44b0d803e4604a93e1b671bf14 +Subproject commit bd91ef344628fec95a68dd31c872df3eda3e9031 From 667db480bf687c2c887681a169f6896d5cf6beee Mon Sep 17 00:00:00 2001 From: juanangp Date: Mon, 15 May 2023 08:22:05 +0000 Subject: [PATCH 72/88] Updating submodule source/libraries/axion --- source/libraries/axion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/axion b/source/libraries/axion index 0b2704a02..636940b0b 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit 0b2704a02684a4af00d8fca3be5de1061717b13c +Subproject commit 636940b0bc79c226db221e72b9296ff0de91cacc From f788c250c34a904d1b6ff8a5259483908e8c321f Mon Sep 17 00:00:00 2001 From: juanangp Date: Mon, 15 May 2023 08:32:52 +0000 Subject: [PATCH 73/88] Updating submodule source/libraries/legacy --- source/libraries/legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/legacy b/source/libraries/legacy index 831424307..bdb9b5d12 160000 --- a/source/libraries/legacy +++ b/source/libraries/legacy @@ -1 +1 @@ -Subproject commit 83142430760cb35c2b3c597b24c1d884a01c0fff +Subproject commit bdb9b5d12ee536d134b1ba7a30a242222878aed3 From a84efdc661086a89746850ff833426aa5a03a078 Mon Sep 17 00:00:00 2001 From: juanangp Date: Mon, 15 May 2023 08:44:49 +0000 Subject: [PATCH 74/88] Updating submodule source/libraries/wimp --- source/libraries/wimp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/wimp b/source/libraries/wimp index 3c0933eec..4ea53bf94 160000 --- a/source/libraries/wimp +++ b/source/libraries/wimp @@ -1 +1 @@ -Subproject commit 3c0933eecb23a96624a2f61dbc259f04e297b016 +Subproject commit 4ea53bf94a833c3ea79f51f2373c95ee0a323027 From 66ee159ea34453f41f4a8162bb20eec591d1fb17 Mon Sep 17 00:00:00 2001 From: juanangp Date: Wed, 17 May 2023 09:28:47 +0000 Subject: [PATCH 75/88] Updating submodule source/packages/restG4 --- source/packages/restG4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/packages/restG4 b/source/packages/restG4 index a29c27d1d..150db527e 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit a29c27d1d34331a2b40db6d2cad40c316bfc1870 +Subproject commit 150db527ed12899824afac61993ca1ba1fd33e96 From 894fd0b809c619dc0ecfbded14016f60c19eac6d Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:06:05 +0000 Subject: [PATCH 76/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index e5b2efdad..a7dca8767 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit e5b2efdadf8af29d310ad1a77fa8539bed78e323 +Subproject commit a7dca8767cc60d6ab51bf656939c7154e97f03d4 From d65692808f78e931e96ddce385dc9ad0380cab06 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:07:23 +0000 Subject: [PATCH 77/88] Updating submodule source/libraries/track --- source/libraries/track | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/track b/source/libraries/track index 87fd3771c..08013296e 160000 --- a/source/libraries/track +++ b/source/libraries/track @@ -1 +1 @@ -Subproject commit 87fd3771cae5ed1f8babb4dfc897216396012dc6 +Subproject commit 08013296efc8586ea6f427b9295fbd30a3c3a46f From 149677776ad4448930fb9890696a29d79de4679c Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:11:14 +0000 Subject: [PATCH 78/88] Updating submodule source/libraries/connectors --- source/libraries/connectors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/connectors b/source/libraries/connectors index bd91ef344..836eeac9b 160000 --- a/source/libraries/connectors +++ b/source/libraries/connectors @@ -1 +1 @@ -Subproject commit bd91ef344628fec95a68dd31c872df3eda3e9031 +Subproject commit 836eeac9b47bef322eaed0ab9063cf2e32f4ae69 From 9f5a1d70e93e3f2c89a194cee9c456a0b26ead04 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:12:32 +0000 Subject: [PATCH 79/88] Updating submodule source/libraries/axion --- source/libraries/axion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/axion b/source/libraries/axion index 636940b0b..de97e4301 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit 636940b0bc79c226db221e72b9296ff0de91cacc +Subproject commit de97e4301553110412c98e87f9aac27854dacbd1 From d8861e52f4442c286f9a48894c0886a54fcf4b51 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:13:44 +0000 Subject: [PATCH 80/88] Updating submodule source/libraries/legacy --- source/libraries/legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/legacy b/source/libraries/legacy index bdb9b5d12..35998e031 160000 --- a/source/libraries/legacy +++ b/source/libraries/legacy @@ -1 +1 @@ -Subproject commit bdb9b5d12ee536d134b1ba7a30a242222878aed3 +Subproject commit 35998e031d74f6acf2dd526d175df2daf4de5861 From da8bb9cb48af6562802c79e5c556ca163ad96587 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:17:06 +0000 Subject: [PATCH 81/88] Updating submodule source/libraries/detector --- source/libraries/detector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/detector b/source/libraries/detector index cb6d71acb..17ce8e485 160000 --- a/source/libraries/detector +++ b/source/libraries/detector @@ -1 +1 @@ -Subproject commit cb6d71acbb686f944909711bb447351d28a6f02f +Subproject commit 17ce8e48562d278c0baf3ac0369b911a3d122a41 From ca10c2a457ce6fffcbab56e006513984e93dabc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Fri, 19 May 2023 10:17:51 +0200 Subject: [PATCH 82/88] Adding pull before push to avoid race condition --- .github/actions/submodulePR/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/submodulePR/action.yml b/.github/actions/submodulePR/action.yml index c3580035d..b2ef3a92b 100644 --- a/.github/actions/submodulePR/action.yml +++ b/.github/actions/submodulePR/action.yml @@ -40,6 +40,7 @@ runs: if: steps.frameworkBranch.outputs.ref == ${{ inputs.branch }} run: | cd framework + git pull git add ${{ inputs.submodule }} var=$(git diff --cached) if [[ -z $var ]]; then From 964ee4a53c1b0f791a4ce145f8dba69bffbe3c80 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:26:18 +0000 Subject: [PATCH 83/88] Updating submodule source/libraries/geant4 --- source/libraries/geant4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/geant4 b/source/libraries/geant4 index ff353aa9e..31100ac9c 160000 --- a/source/libraries/geant4 +++ b/source/libraries/geant4 @@ -1 +1 @@ -Subproject commit ff353aa9ea1d04c43c23f59c49e5d84b86b1bd46 +Subproject commit 31100ac9c4f1ca367661a5677a71bf8cf99af84e From baac71a12f477f94d44178fa4edae20579e93e3f Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:26:53 +0000 Subject: [PATCH 84/88] Updating submodule source/libraries/wimp --- source/libraries/wimp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/wimp b/source/libraries/wimp index 4ea53bf94..896e05182 160000 --- a/source/libraries/wimp +++ b/source/libraries/wimp @@ -1 +1 @@ -Subproject commit 4ea53bf94a833c3ea79f51f2373c95ee0a323027 +Subproject commit 896e05182734eed1c94c4f7d6acdf8e039ec675d From 0c883a51bdadc3f5178c0c41a7aebec5ca329766 Mon Sep 17 00:00:00 2001 From: juanangp Date: Fri, 19 May 2023 08:37:47 +0000 Subject: [PATCH 85/88] Updating submodule source/packages/restG4 --- source/packages/restG4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/packages/restG4 b/source/packages/restG4 index 150db527e..c6781533c 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit 150db527ed12899824afac61993ca1ba1fd33e96 +Subproject commit c6781533c64e0c940d8eef645bd24605939d1c86 From e43937f178337d337bf0db3ccbdbfd94cf0e2e16 Mon Sep 17 00:00:00 2001 From: juanangp Date: Tue, 23 May 2023 15:36:10 +0000 Subject: [PATCH 86/88] Updating submodule source/libraries/raw --- source/libraries/raw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/raw b/source/libraries/raw index a7dca8767..eb42cb91b 160000 --- a/source/libraries/raw +++ b/source/libraries/raw @@ -1 +1 @@ -Subproject commit a7dca8767cc60d6ab51bf656939c7154e97f03d4 +Subproject commit eb42cb91b80ed7fe91bf462e9f72ff364e4277e9 From 9e774bfa36b3ba90885af44147ec111d08fb533d Mon Sep 17 00:00:00 2001 From: juanangp Date: Tue, 23 May 2023 15:37:12 +0000 Subject: [PATCH 87/88] Updating submodule source/packages/restG4 --- source/packages/restG4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/packages/restG4 b/source/packages/restG4 index c6781533c..fb670a124 160000 --- a/source/packages/restG4 +++ b/source/packages/restG4 @@ -1 +1 @@ -Subproject commit c6781533c64e0c940d8eef645bd24605939d1c86 +Subproject commit fb670a124f2280416851705e7f3e614908db62f7 From fb03c345db496458644b86ff93b8abe097c36174 Mon Sep 17 00:00:00 2001 From: jgalan Date: Thu, 1 Jun 2023 17:09:45 +0000 Subject: [PATCH 88/88] Updating submodule source/libraries/axion --- source/libraries/axion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libraries/axion b/source/libraries/axion index de97e4301..b32b706b7 160000 --- a/source/libraries/axion +++ b/source/libraries/axion @@ -1 +1 @@ -Subproject commit de97e4301553110412c98e87f9aac27854dacbd1 +Subproject commit b32b706b710f000586b6f76ba72dbd271975775e