From d95b1720e4f03b4c751d62337f098c2d3217f137 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Fri, 20 Sep 2024 09:39:46 -0500 Subject: [PATCH 01/48] Adding tmate to CI for debugging --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9293e319b42..543d660dac5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,6 +155,11 @@ jobs: cpp-coveralls -i src -i include -e src/external --exclude-pattern "/usr/*" --dump cpp_cov.json coveralls --merge=cpp_cov.json --service=github + - name: Setup tmate debug session + if: ${{ failure() }} + uses: mxschmitt/action-tmate@v3 + timeout-minutes: 15 + finish: needs: main runs-on: ubuntu-latest From b18f5b5175233d25884ea611d8fc0da890893beb Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 13:41:26 -0500 Subject: [PATCH 02/48] Only enable tmate if [ci-debug] is in the commit message --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 543d660dac5..a4941e09a52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,7 @@ jobs: coveralls --merge=cpp_cov.json --service=github - name: Setup tmate debug session - if: ${{ failure() }} + if: contains(github.event.head_commit.message, '[ci-debug]') uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 From 54cdb0c6892b2848899fd87c9312555fc4e2446c Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 13:44:29 -0500 Subject: [PATCH 03/48] Add artificial failure to tests --- tests/regression_tests/asymmetric_lattice/test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/regression_tests/asymmetric_lattice/test.py b/tests/regression_tests/asymmetric_lattice/test.py index fadf272ffd3..3f273b1a470 100644 --- a/tests/regression_tests/asymmetric_lattice/test.py +++ b/tests/regression_tests/asymmetric_lattice/test.py @@ -92,4 +92,5 @@ def _get_results(self, hash_output=True): def test_asymmetric_lattice(): harness = AsymmetricLatticeTestHarness('statepoint.10.h5') + raise ValueError('artificial failure') harness.main() From 3c4cc3f61d6d785df2c44200b70bd15140c83dca Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 13:51:52 -0500 Subject: [PATCH 04/48] Make the tests fail faster and better and more spectacularly than ever before --- .github/workflows/ci.yml | 2 +- tools/ci/gha-script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4941e09a52..cc755793fe7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,7 @@ jobs: coveralls --merge=cpp_cov.json --service=github - name: Setup tmate debug session - if: contains(github.event.head_commit.message, '[ci-debug]') + if: contains(github.event.head_commit.message, '[gha-debug]') uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 diff --git a/tools/ci/gha-script.sh b/tools/ci/gha-script.sh index 9de84f3e553..6cbb04faa1d 100755 --- a/tools/ci/gha-script.sh +++ b/tools/ci/gha-script.sh @@ -22,4 +22,4 @@ if [[ $NCRYSTAL = 'y' ]]; then fi # Run regression and unit tests -pytest --cov=openmc -v $args tests +pytest --cov=openmc -x -v $args tests From dc8d981ca872588536919ec950decd802f81ad3b Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 14:09:53 -0500 Subject: [PATCH 05/48] Triggering debug session [gha-debug] From ad542d0987374a6b8c57fbb0968b9270e123bcbb Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 14:25:00 -0500 Subject: [PATCH 06/48] Start tmate detatched [gha-debug] --- .github/workflows/ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc755793fe7..4eb2e7c81a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,6 +89,13 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Setup tmate debug session + if: contains(github.event.head_commit.message, '[gha-debug]') + uses: mxschmitt/action-tmate@v3 + timeout-minutes: 15 + with: + detatched: true + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -155,11 +162,6 @@ jobs: cpp-coveralls -i src -i include -e src/external --exclude-pattern "/usr/*" --dump cpp_cov.json coveralls --merge=cpp_cov.json --service=github - - name: Setup tmate debug session - if: contains(github.event.head_commit.message, '[gha-debug]') - uses: mxschmitt/action-tmate@v3 - timeout-minutes: 15 - finish: needs: main runs-on: ubuntu-latest From dbfcd47868a4c155cf12bdd718427c7cac33d189 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 14:34:40 -0500 Subject: [PATCH 07/48] Updating tmate syntax [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4eb2e7c81a6..779cc946474 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup tmate debug session - if: contains(github.event.head_commit.message, '[gha-debug]') + if: ${{ contains(github.event.head_commit.message, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 with: From b84af4c25700f2297f036dde9e50f2ff131e773c Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 14:42:46 -0500 Subject: [PATCH 08/48] Trying quotes [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 779cc946474..3d1b8798567 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup tmate debug session - if: ${{ contains(github.event.head_commit.message, '[gha-debug]') }} + if: "contains(github.event.head_commit.message, '[gha-debug]')" uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 with: From 279560e23b7c5cbae168570ee81ac53d13570be8 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 14:45:22 -0500 Subject: [PATCH 09/48] Trying endswith [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d1b8798567..6037d7c47ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup tmate debug session - if: "contains(github.event.head_commit.message, '[gha-debug]')" + if: ${{ endsWith(github.event.head_commit.message, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 with: From e0d9efe4f6ce15b14a631e28fbbbc4bcfe1e584d Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 14:56:46 -0500 Subject: [PATCH 10/48] Update ci.yml --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6037d7c47ab..3d278344e2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,6 +95,10 @@ jobs: timeout-minutes: 15 with: detatched: true + + - name: Echo event + run: | + echo "${{toJSON(github.event)}}" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 From 9a6944dc9847eda0219ad279d8842a86547d525e Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:13:17 -0500 Subject: [PATCH 11/48] It can't be that difficult [gha-debug] --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d278344e2c..126f2403383 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,8 +89,13 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set commit message env var + run: | + COMMIT_MESSAGE_HEADER=$(git log -1 --pretty=%B) + echo "COMMIT_MESSAGE_HEADER=${COMMIT_MESSAGE_HEADER}" >> $GITHUB_ENV + - name: Setup tmate debug session - if: ${{ endsWith(github.event.head_commit.message, '[gha-debug]') }} + if: ${{ endsWith( ${{ env.COMMIT_MESSAGE_HEADER }} , '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 with: From 38bc338efa542e246a0c65ec1861a568a9933854 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:15:10 -0500 Subject: [PATCH 12/48] It is that difficult. [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 126f2403383..23b98e08590 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: echo "COMMIT_MESSAGE_HEADER=${COMMIT_MESSAGE_HEADER}" >> $GITHUB_ENV - name: Setup tmate debug session - if: ${{ endsWith( ${{ env.COMMIT_MESSAGE_HEADER }} , '[gha-debug]') }} + if: ${{ endsWith(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 with: From 3510237a3055204ab08f3bacf04b99ab5a2b8de6 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:17:53 -0500 Subject: [PATCH 13/48] Skip that debug boi --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23b98e08590..57bfe954325 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,7 @@ jobs: - name: Setup tmate debug session if: ${{ endsWith(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 - timeout-minutes: 15 + timeout-minutes: 20 with: detatched: true From 1adb0dd7568e68e1f8cc40fc7dc64e7a2752e62f Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:20:12 -0500 Subject: [PATCH 14/48] Don't limit me! [gha-debug] --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57bfe954325..8bb90a3ff59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,6 @@ jobs: - name: Setup tmate debug session if: ${{ endsWith(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 - timeout-minutes: 20 with: detatched: true From 6b9459aeb7cec873941ef85015df2c38ca6e309c Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:23:35 -0500 Subject: [PATCH 15/48] Less clingy [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bb90a3ff59..48c8f3e560d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,7 +98,7 @@ jobs: if: ${{ endsWith(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 with: - detatched: true + detached: true - name: Echo event run: | From 6a9379708e5484f7ef94c27d157e64a1d46cef8e Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:31:39 -0500 Subject: [PATCH 16/48] debug [gha-debug] that gha --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48c8f3e560d..77f0604ffdb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: echo "COMMIT_MESSAGE_HEADER=${COMMIT_MESSAGE_HEADER}" >> $GITHUB_ENV - name: Setup tmate debug session - if: ${{ endsWith(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} + if: ${{ contains(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 with: detached: true From bc0a68691d8fe633ad233976643b778e256a44fb Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 16:37:06 -0500 Subject: [PATCH 17/48] no debug --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77f0604ffdb..9e10f9bc149 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,8 +91,8 @@ jobs: - name: Set commit message env var run: | - COMMIT_MESSAGE_HEADER=$(git log -1 --pretty=%B) - echo "COMMIT_MESSAGE_HEADER=${COMMIT_MESSAGE_HEADER}" >> $GITHUB_ENV + COMMIT_MESSAGE=$(git log -1 --pretty=%B) + echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Setup tmate debug session if: ${{ contains(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} From a31e2c501fb0e64adf627d808dfe8e7250a01af1 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 17:33:46 -0500 Subject: [PATCH 18/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e10f9bc149..d786f80cfe6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Setup tmate debug session - if: ${{ contains(env.COMMIT_MESSAGE_HEADER, '[gha-debug]') }} + if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 with: detached: true From 439fb2d8780d0cba98636ab551affa4aaf4d1e77 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 17:35:08 -0500 Subject: [PATCH 19/48] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d786f80cfe6..93496242358 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - name: Set commit message env var run: | COMMIT_MESSAGE=$(git log -1 --pretty=%B) - echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV + echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Setup tmate debug session if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} From 807d7c5cf3afc7a1fd6a6ab4636ae52a66a2d029 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 17:57:20 -0500 Subject: [PATCH 20/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93496242358..105b9cb0ebe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,7 @@ jobs: - name: Set commit message env var run: | COMMIT_MESSAGE=$(git log -1 --pretty=%B) + echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Setup tmate debug session From 719b60a48b47c32367394068d332724228b6cfde Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 18:29:19 -0500 Subject: [PATCH 21/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 105b9cb0ebe..7599c26679c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,10 +88,12 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 2 - name: Set commit message env var run: | - COMMIT_MESSAGE=$(git log -1 --pretty=%B) + COMMIT_MESSAGE=$(git log HEAD~1 -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV From 055ab27754e84068ad16e95e215943e9d9d34dc1 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 20:31:55 -0500 Subject: [PATCH 22/48] Getting info about PR event --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7599c26679c..f5ec7925cd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,6 +91,10 @@ jobs: with: fetch-depth: 2 + - name: Payload info + run: | + echo "Repo: ${{ github.event.pull_request.head.repo }}" + - name: Set commit message env var run: | COMMIT_MESSAGE=$(git log HEAD~1 -1 --pretty=%B) From f920e5b15027082ea020370beb63598829f170c5 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 20:33:23 -0500 Subject: [PATCH 23/48] More info --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5ec7925cd7..c829621e830 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: - name: Payload info run: | - echo "Repo: ${{ github.event.pull_request.head.repo }}" + echo "Repo: ${{ github.event.pull_request.head.repo.commits_url }}" - name: Set commit message env var run: | From 642c579ff0d09d8acfd14e5bd2da5e456aff3e7c Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 20:35:35 -0500 Subject: [PATCH 24/48] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c829621e830..a6c3094bdbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,6 +94,7 @@ jobs: - name: Payload info run: | echo "Repo: ${{ github.event.pull_request.head.repo.commits_url }}" + echo "HEAD Ref: ${{ github.event.pull_request.head.ref }}" - name: Set commit message env var run: | From 0061084a2b7b63ce084ff42eddea3e7bf6135b79 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 20:37:50 -0500 Subject: [PATCH 25/48] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6c3094bdbc..09e724fc962 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: - name: Payload info run: | - echo "Repo: ${{ github.event.pull_request.head.repo.commits_url }}" + echo "Repo: ${{ github.event.pull_request.head.repo.name }}" echo "HEAD Ref: ${{ github.event.pull_request.head.ref }}" - name: Set commit message env var From ac9508c08d7ecd1d9ece84f422f7b87daebd4623 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 20:39:01 -0500 Subject: [PATCH 26/48] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09e724fc962..bea5d99793f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,6 +93,7 @@ jobs: - name: Payload info run: | + echo "Repo: ${{ github.event.pull_request.head.repo.owner }}" echo "Repo: ${{ github.event.pull_request.head.repo.name }}" echo "HEAD Ref: ${{ github.event.pull_request.head.ref }}" From a2e09d372dd46ceb37f5895fde89ef106c21c945 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 20:40:05 -0500 Subject: [PATCH 27/48] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bea5d99793f..1ea412f6d84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: - name: Payload info run: | - echo "Repo: ${{ github.event.pull_request.head.repo.owner }}" + echo "Repo: ${{ github.event.pull_request.head.repo.owner.name }}" echo "Repo: ${{ github.event.pull_request.head.repo.name }}" echo "HEAD Ref: ${{ github.event.pull_request.head.ref }}" From d948edabd27972f5e7f7113f98d28e47b0e67248 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:02:06 -0500 Subject: [PATCH 28/48] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ea412f6d84..3261cf96c97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,8 @@ jobs: echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Setup tmate debug session - if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} + #if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} + if: true uses: mxschmitt/action-tmate@v3 with: detached: true From 3efdb3210fa68ffeaaee0e3d5e08a83f23c82589 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:05:20 -0500 Subject: [PATCH 29/48] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3261cf96c97..a641b62c6bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: - name: Set commit message env var run: | - COMMIT_MESSAGE=$(git log HEAD~1 -1 --pretty=%B) + COMMIT_MESSAGE=$(git log HEAD -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV From 585400471e71dfb7f31467a2f0b1d487e3d26c48 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:22:01 -0500 Subject: [PATCH 30/48] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a641b62c6bd..22898096e57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,9 @@ jobs: - name: Set commit message env var run: | - COMMIT_MESSAGE=$(git log HEAD -1 --pretty=%B) + # get the sha of the last branch commit + sha=$(git rev-list --parents -n 1 HEAD | cut -d" " -f 3) + COMMIT_MESSAGE=$(git log $sha -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV From 07574501d9cc05ed57f4c16d5abf418709240bde Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:24:01 -0500 Subject: [PATCH 31/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22898096e57..9e3630e4e09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,14 +100,13 @@ jobs: - name: Set commit message env var run: | # get the sha of the last branch commit - sha=$(git rev-list --parents -n 1 HEAD | cut -d" " -f 3) - COMMIT_MESSAGE=$(git log $sha -1 --pretty=%B) + BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | cut -d" " -f 3) + COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Setup tmate debug session - #if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} - if: true + if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 with: detached: true From a936dbad8d864b5846e043e2ae1338d4dcb3b08d Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:25:29 -0500 Subject: [PATCH 32/48] Update ci.yml --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e3630e4e09..e0563eabb91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,10 +110,6 @@ jobs: uses: mxschmitt/action-tmate@v3 with: detached: true - - - name: Echo event - run: | - echo "${{toJSON(github.event)}}" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 From e70ac2dfbf684cda38d0f6a5dc48654ede9dd807 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:28:15 -0500 Subject: [PATCH 33/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0563eabb91..07719af9598 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: - name: Set commit message env var run: | # get the sha of the last branch commit - BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | cut -d" " -f 3) + BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV From 491f3dc6eb1cc0b2ca5adf17314c79f273787243 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:34:40 -0500 Subject: [PATCH 34/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07719af9598..d81e86cbd2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,10 @@ jobs: - name: Set commit message env var run: | # get the sha of the last branch commit - BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) + if: ${{ github.event.name == 'pull_request' }} + BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) + else: + BRANCH_SHA=HEAD COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV From a2fd5bcc389b8bb2ff046e7622dede828f562af2 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:36:24 -0500 Subject: [PATCH 35/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d81e86cbd2b..dffd17b3301 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,9 +100,9 @@ jobs: - name: Set commit message env var run: | # get the sha of the last branch commit - if: ${{ github.event.name == 'pull_request' }} + if [ ${{ github.event_name }} == "pull_request" ] ; then BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) - else: + fi BRANCH_SHA=HEAD COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) echo ${COMMIT_MESSAGE} From 32297fd83e66f9dab79c32d477bf13721892b1f3 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:38:38 -0500 Subject: [PATCH 36/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dffd17b3301..353fc449c87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,6 +96,7 @@ jobs: echo "Repo: ${{ github.event.pull_request.head.repo.owner.name }}" echo "Repo: ${{ github.event.pull_request.head.repo.name }}" echo "HEAD Ref: ${{ github.event.pull_request.head.ref }}" + echo "Event Name: ${{ github.event_name }}" - name: Set commit message env var run: | From 4aa7d49de6eca9a58b4380bfa967aa1abca455a6 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:39:55 -0500 Subject: [PATCH 37/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 353fc449c87..7791e71a6ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: - name: Set commit message env var run: | # get the sha of the last branch commit - if [ ${{ github.event_name }} == "pull_request" ] ; then + if [ "${{ github.event_name }}" == "pull_request" ] ; then BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) fi BRANCH_SHA=HEAD From 90a347429714c7e73f3e92512a1bd34b71fa8db4 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:43:50 -0500 Subject: [PATCH 38/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7791e71a6ec..377c5667d86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,10 +101,11 @@ jobs: - name: Set commit message env var run: | # get the sha of the last branch commit - if [ "${{ github.event_name }}" == "pull_request" ] ; then + if [ "${{ github.event_name }}" == "pull_request" ]; then BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) - fi + else BRANCH_SHA=HEAD + fi COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV From 649e0bb132909dc3bedb908e5e6f16f2c7740608 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:44:48 -0500 Subject: [PATCH 39/48] Update ci.yml --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 377c5667d86..ee22ac291c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,13 +91,6 @@ jobs: with: fetch-depth: 2 - - name: Payload info - run: | - echo "Repo: ${{ github.event.pull_request.head.repo.owner.name }}" - echo "Repo: ${{ github.event.pull_request.head.repo.name }}" - echo "HEAD Ref: ${{ github.event.pull_request.head.ref }}" - echo "Event Name: ${{ github.event_name }}" - - name: Set commit message env var run: | # get the sha of the last branch commit From 7c61faaf72dec7b98f21e970635e76d71097b7ac Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 10 Oct 2024 21:46:07 -0500 Subject: [PATCH 40/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee22ac291c7..cc8a28e5e29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,8 +95,10 @@ jobs: run: | # get the sha of the last branch commit if [ "${{ github.event_name }}" == "pull_request" ]; then + # use the last reference in the parents of the merge commit for pull request events BRANCH_SHA=$(git rev-list --parents -n 1 HEAD | rev | cut -d" " -f 1 | rev) else + # use the current head for push events BRANCH_SHA=HEAD fi COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) From 34fd6729228d99113615d20dbf301a92cc1b2a41 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Fri, 11 Oct 2024 13:49:39 -0500 Subject: [PATCH 41/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc8a28e5e29..74d61decfbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,12 +105,6 @@ jobs: echo ${COMMIT_MESSAGE} echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - - name: Setup tmate debug session - if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} - uses: mxschmitt/action-tmate@v3 - with: - detached: true - - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -171,6 +165,11 @@ jobs: CTEST_OUTPUT_ON_FAILURE=1 make test -C $GITHUB_WORKSPACE/build/ $GITHUB_WORKSPACE/tools/ci/gha-script.sh + - name: Setup tmate debug session + if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} && ${{ failure() }} + uses: mxschmitt/action-tmate@v3 + timeout-minutes: 15 + - name: after_success shell: bash run: | From c98390fcb98a59fe92ebd90d8dd013f4def5684e Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Fri, 11 Oct 2024 14:02:27 -0500 Subject: [PATCH 42/48] Update test.py [gha-debug] --- tests/regression_tests/asymmetric_lattice/test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/regression_tests/asymmetric_lattice/test.py b/tests/regression_tests/asymmetric_lattice/test.py index 3f273b1a470..fadf272ffd3 100644 --- a/tests/regression_tests/asymmetric_lattice/test.py +++ b/tests/regression_tests/asymmetric_lattice/test.py @@ -92,5 +92,4 @@ def _get_results(self, hash_output=True): def test_asymmetric_lattice(): harness = AsymmetricLatticeTestHarness('statepoint.10.h5') - raise ValueError('artificial failure') harness.main() From a8a8ab46c1b55f08e870ef0737e50947ba6a77dc Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Sat, 12 Oct 2024 09:30:17 -0500 Subject: [PATCH 43/48] Update gha-script.sh --- tools/ci/gha-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/gha-script.sh b/tools/ci/gha-script.sh index 6cbb04faa1d..9de84f3e553 100755 --- a/tools/ci/gha-script.sh +++ b/tools/ci/gha-script.sh @@ -22,4 +22,4 @@ if [[ $NCRYSTAL = 'y' ]]; then fi # Run regression and unit tests -pytest --cov=openmc -x -v $args tests +pytest --cov=openmc -v $args tests From 24083d4559671c631b837de00a65a9fb766eeea6 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Sat, 12 Oct 2024 10:48:00 -0500 Subject: [PATCH 44/48] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74d61decfbf..de95916951c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,7 +166,7 @@ jobs: $GITHUB_WORKSPACE/tools/ci/gha-script.sh - name: Setup tmate debug session - if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} && ${{ failure() }} + if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') && failure() }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 15 From 182587e4405e92e65eb0b208d7162ad8ef9bf624 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Sat, 12 Oct 2024 13:22:32 -0500 Subject: [PATCH 45/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de95916951c..b6b9f3b0c30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -168,7 +168,7 @@ jobs: - name: Setup tmate debug session if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') && failure() }} uses: mxschmitt/action-tmate@v3 - timeout-minutes: 15 + timeout-minutes: 10 - name: after_success shell: bash From 25c795d9cab60f0951226da986581227100ae854 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Mon, 14 Oct 2024 15:45:14 -0500 Subject: [PATCH 46/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6b9f3b0c30..76b4120e30c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,6 +166,7 @@ jobs: $GITHUB_WORKSPACE/tools/ci/gha-script.sh - name: Setup tmate debug session + continue-on-error: true if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') && failure() }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 10 From 25bf1fd03fb792366d7c508560801d0aa6b8d970 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Mon, 14 Oct 2024 16:33:53 -0500 Subject: [PATCH 47/48] Update ci.yml [gha-debug] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76b4120e30c..6586aeae2e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,7 +167,7 @@ jobs: - name: Setup tmate debug session continue-on-error: true - if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') && failure() }} + if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 10 From 4aae03515f06e08408b6c540fdbf7c10bf297319 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 6 Feb 2025 10:39:22 -0600 Subject: [PATCH 48/48] Updating commit message echo [gha-debug] --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6586aeae2e0..7b968cc8f97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,7 @@ jobs: BRANCH_SHA=HEAD fi COMMIT_MESSAGE=$(git log $BRANCH_SHA -1 --pretty=%B) - echo ${COMMIT_MESSAGE} + echo "Commit message: ${COMMIT_MESSAGE}" echo "COMMIT_MESSAGE=${COMMIT_MESSAGE}" >> $GITHUB_ENV - name: Set up Python ${{ matrix.python-version }} @@ -170,7 +170,7 @@ jobs: if: ${{ contains(env.COMMIT_MESSAGE, '[gha-debug]') }} uses: mxschmitt/action-tmate@v3 timeout-minutes: 10 - + - name: after_success shell: bash run: |