From 8a3295aaca95897bbf645e07eebf106162121403 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Mon, 10 Feb 2025 15:51:54 +0800 Subject: [PATCH 01/21] Update ci.yml --- .github/workflows/ci.yml | 56 ++++++---------------------------------- 1 file changed, 8 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03e1e6f279..f23e7e5574 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -252,52 +252,12 @@ jobs: cd BUILD && . buildenv.sh make standalones + - name: Build test dependencies + run: | + git clone --recursive https://github.com/GambitBSM/gambit-test + sudo apt install numdiff + pip install git+https://github.com/GambitBSM/gambit-yaml - # - name: Validation dependencies - # run: | - # . BUILD/buildenv.sh - # pip install cowsay - # # Fetch my tests - # git clone https://github.com/andrewfowlie/gambit_bats - # cd gambit_bats - # cowsay "$(git log -n 5)" - # # Install BATS - # git clone https://github.com/bats-core/bats-core.git - # echo 'export PATH=$PATH:$GITHUB_WORKSPACE/gambit_bats/bats-core/bin' >> ../BUILD/buildenv.sh - # # Install numdiff - # git clone https://github.com/tjhei/numdiff - # (cd numdiff && ./configure && make) - # echo 'export PATH=$PATH:$GITHUB_WORKSPACE/gambit_bats/numdiff' >> ../BUILD/buildenv.sh - # - name: Validate with BATS - # run: | - # #cat BUILD/buildenv.sh - # . BUILD/buildenv.sh - # cowsay "Testing GAMBIT on $(date)" - # cowsay "$(git log -n 5)" - # cd gambit_bats - # ls - # #echo "Testing BATS" - # #bats -h - # #echo "Testing numdiff" - # #numdiff || true - # echo "Running BATS" - # export GAMBIT="$GITHUB_WORKSPACE" - # #(python2 `which bats` *.bats | tee $GAMBIT/bats.txt) || true - # (bats *.bats | tee $GAMBIT/bats.txt) || true - # cd .. - # # Note email addresses for failed tests - # source gambit_bats/email.bash - # export BATS_FAIL_EMAIL=$(bats_fail_email ./bats.tap) - # export GIT_FAIL_EMAIL="$(git_fail_email ./gambit_bats) $(git_fail_email ./)" - # cowsay "For BATS yaml failures, contact $BATS_FAIL_EMAIL" - # cowsay "For GAMBIT and test changes, contact $GIT_FAIL_EMAIL" - # echo - # # Run again, now with TAP output (may fail, causing the job to report correctly) - # echo "Running BATS with TAP output (to bats.tap)" - # cd gambit_bats - # bats --tap *.bats > $GAMBIT/bats.tap - # - name: Upload BATS output - # uses: actions/upload-artifact@v2 - # with: - # name: bats_tests - # path: bats.t* + - name: Run tests + run: | + ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From c6792ac5494ea791c9cb23227ac8df81221d48a0 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Mon, 10 Feb 2025 15:55:35 +0800 Subject: [PATCH 02/21] add tests --- .github/workflows/ci_linux.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 184ecae895..e32fce2893 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -189,3 +189,13 @@ jobs: export PATH=$PATH:/scratch2/shared/patch cd BUILD make standalones + + - name: Build test dependencies + run: | + git clone --recursive https://github.com/GambitBSM/gambit-test + sudo apt install numdiff + pip install git+https://github.com/GambitBSM/gambit-yaml + + - name: Run tests + run: | + ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From d2e6b72a943524ef9a52aaa053e5c9b405faf94b Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Mon, 10 Feb 2025 15:56:00 +0800 Subject: [PATCH 03/21] Update ci_Mac_x64.yml --- .github/workflows/ci_Mac_x64.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci_Mac_x64.yml b/.github/workflows/ci_Mac_x64.yml index a06cc7d19e..8d6b4b2917 100644 --- a/.github/workflows/ci_Mac_x64.yml +++ b/.github/workflows/ci_Mac_x64.yml @@ -182,3 +182,13 @@ jobs: echo "Test the building of the standalones" cd BUILD make standalones + + - name: Build test dependencies + run: | + git clone --recursive https://github.com/GambitBSM/gambit-test + sudo apt install numdiff + pip install git+https://github.com/GambitBSM/gambit-yaml + + - name: Run tests + run: | + ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 5b28fe9f276e12cd31a35fad4826fa07ad6ac5eb Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Mon, 10 Feb 2025 15:56:23 +0800 Subject: [PATCH 04/21] Update ci_Mac_arm64.yml --- .github/workflows/ci_Mac_arm64.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml index 69eeb959e3..4d80dd28ee 100644 --- a/.github/workflows/ci_Mac_arm64.yml +++ b/.github/workflows/ci_Mac_arm64.yml @@ -186,3 +186,13 @@ jobs: echo "Test the building of the standalones" cd BUILD make standalones + + - name: Build test dependencies + run: | + git clone --recursive https://github.com/GambitBSM/gambit-test + sudo apt install numdiff + pip install git+https://github.com/GambitBSM/gambit-yaml + + - name: Run tests + run: | + ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 4c5e3bc6d7d56db88dac49b1957314b1106bf03a Mon Sep 17 00:00:00 2001 From: GAMBIT Mac CI Runner Date: Tue, 11 Feb 2025 05:58:24 -0800 Subject: [PATCH 05/21] Make Mac CI use python environment, and avoid sudo install --- .github/workflows/ci_Mac_arm64.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml index 4d80dd28ee..b1e2c37f71 100644 --- a/.github/workflows/ci_Mac_arm64.yml +++ b/.github/workflows/ci_Mac_arm64.yml @@ -24,6 +24,7 @@ jobs: - name: Set up build environment run: | echo "Set up the build environment" + source /Users/gambitci/Packages/GBTest_Venv/bin/activate mkdir -p BUILD cd BUILD - name: Configure with cmake @@ -73,6 +74,7 @@ jobs: - name: Set up build environment run: | echo "Set up the build environment" + source /Users/gambitci/Packages/GBTest_Venv/bin/activate mkdir -p BUILD cd BUILD - name: Configure with cmake @@ -108,6 +110,7 @@ jobs: - name: Set up build environment run: | echo "Set up the build environment" + source /Users/gambitci/Packages/GBTest_Venv/bin/activate mkdir -p BUILD cd BUILD - name: Configure with cmake @@ -172,6 +175,7 @@ jobs: - name: Set up build environment run: | echo "Set up the build environment" + source /Users/gambitci/Packages/GBTest_Venv/bin/activate mkdir -p BUILD cd BUILD - name: Configure with cmake @@ -190,8 +194,9 @@ jobs: - name: Build test dependencies run: | git clone --recursive https://github.com/GambitBSM/gambit-test - sudo apt install numdiff - pip install git+https://github.com/GambitBSM/gambit-yaml + python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml + #sudo apt install numdiff + #pip install git+https://github.com/GambitBSM/gambit-yaml - name: Run tests run: | From 1f873ba5cd3e41402a51cbf35754ef867d73f49d Mon Sep 17 00:00:00 2001 From: ChrisJChang <59903135+ChrisJChang@users.noreply.github.com> Date: Tue, 11 Feb 2025 15:37:50 +0100 Subject: [PATCH 06/21] Add extra venv sources to Mac CI --- .github/workflows/ci_Mac_arm64.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml index b1e2c37f71..0aec4a06b8 100644 --- a/.github/workflows/ci_Mac_arm64.yml +++ b/.github/workflows/ci_Mac_arm64.yml @@ -193,6 +193,7 @@ jobs: - name: Build test dependencies run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate git clone --recursive https://github.com/GambitBSM/gambit-test python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml #sudo apt install numdiff @@ -200,4 +201,5 @@ jobs: - name: Run tests run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 0aa7a4dfed4970c15527ec641abddab22bf9e3ac Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 10:27:18 +0800 Subject: [PATCH 07/21] rm old lines --- .github/workflows/ci_Mac_arm64.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml index 0aec4a06b8..e4d9395ffd 100644 --- a/.github/workflows/ci_Mac_arm64.yml +++ b/.github/workflows/ci_Mac_arm64.yml @@ -196,8 +196,6 @@ jobs: source /Users/gambitci/Packages/GBTest_Venv/bin/activate git clone --recursive https://github.com/GambitBSM/gambit-test python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml - #sudo apt install numdiff - #pip install git+https://github.com/GambitBSM/gambit-yaml - name: Run tests run: | From 0d9a274498d3f31dab8836e92b35ad52d095f48c Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 10:27:48 +0800 Subject: [PATCH 08/21] fix tests --- .github/workflows/ci_linux.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index e32fce2893..a6197576ba 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -192,10 +192,11 @@ jobs: - name: Build test dependencies run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate git clone --recursive https://github.com/GambitBSM/gambit-test - sudo apt install numdiff - pip install git+https://github.com/GambitBSM/gambit-yaml + python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml - name: Run tests run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 8e4696aa1ce148d0088ae6ca1be359423267b256 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 10:28:26 +0800 Subject: [PATCH 09/21] fix tests --- .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 f23e7e5574..209e3e1fc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -254,10 +254,11 @@ jobs: - name: Build test dependencies run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate git clone --recursive https://github.com/GambitBSM/gambit-test - sudo apt install numdiff - pip install git+https://github.com/GambitBSM/gambit-yaml + python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml - name: Run tests run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 67bef7a0a461820e954cbcb16913a21e2f0a7d01 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 10:28:58 +0800 Subject: [PATCH 10/21] fix tests --- .github/workflows/ci_Mac_x64.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_Mac_x64.yml b/.github/workflows/ci_Mac_x64.yml index 8d6b4b2917..f83964be5b 100644 --- a/.github/workflows/ci_Mac_x64.yml +++ b/.github/workflows/ci_Mac_x64.yml @@ -185,10 +185,11 @@ jobs: - name: Build test dependencies run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate git clone --recursive https://github.com/GambitBSM/gambit-test - sudo apt install numdiff - pip install git+https://github.com/GambitBSM/gambit-yaml + python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml - name: Run tests run: | + source /Users/gambitci/Packages/GBTest_Venv/bin/activate ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 4c640ac857d739b735f28112ef72aecb987aeb81 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 13:06:51 +0800 Subject: [PATCH 11/21] add gambit env var --- .github/workflows/ci_Mac_arm64.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml index e4d9395ffd..288b0ce332 100644 --- a/.github/workflows/ci_Mac_arm64.yml +++ b/.github/workflows/ci_Mac_arm64.yml @@ -200,4 +200,5 @@ jobs: - name: Run tests run: | source /Users/gambitci/Packages/GBTest_Venv/bin/activate + export GAMBIT=. ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats From 1d80402d11c7b457df44f41c8a097b977edb417b Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 14:51:15 +0800 Subject: [PATCH 12/21] Create docs.yml --- .github/workflows/docs.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 0000000000..4c6b5d3b41 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,27 @@ +name: Documentation CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: configure + run: ./configure + + - name: Build test dependencies + run: | + git clone --recursive https://github.com/GambitBSM/gambit-test + python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml + + - name: Run tests + run: | + ./gambit-test/test/bats/bin/bats ./gambit-test/test/docs.bats From d65d9a8dd5910e7dbf9b75f50b72625a030a5887 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 14:52:31 +0800 Subject: [PATCH 13/21] rm accidental copy & paste --- .github/workflows/docs.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4c6b5d3b41..a543e557cf 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,10 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - - - name: configure - run: ./configure - + - name: Build test dependencies run: | git clone --recursive https://github.com/GambitBSM/gambit-test From 369ac41cb18dd358296cc742d193e36e2e8b6f4d Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 14:59:01 +0800 Subject: [PATCH 14/21] fix gambit dir --- .github/workflows/docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a543e557cf..416319d45b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,7 @@ on: branches: [ "master" ] jobs: - build: + test_docs: runs-on: ubuntu-latest @@ -21,4 +21,5 @@ jobs: - name: Run tests run: | + export GAMBIT=. ./gambit-test/test/bats/bin/bats ./gambit-test/test/docs.bats From 51a47b06eb3355b6452e90bb4b670a21690bf49e Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:01:08 +0800 Subject: [PATCH 15/21] tap format --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 416319d45b..d9ba8fe5c5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,4 +22,4 @@ jobs: - name: Run tests run: | export GAMBIT=. - ./gambit-test/test/bats/bin/bats ./gambit-test/test/docs.bats + ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats From da87d2e1209f0e7a4485e1cfb5b2ea160b09c9d6 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:05:34 +0800 Subject: [PATCH 16/21] summary of tap --- .github/workflows/docs.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d9ba8fe5c5..19944e6140 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,4 +22,9 @@ jobs: - name: Run tests run: | export GAMBIT=. - ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats + ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats > docs.tap + + - name: Summarize Test Results + uses: pcolby/tap-summary@v1.2.0 + with: + path: docs.tap From 59f0523c17efb8a767961958e3abac0a90fea0fa Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:16:14 +0800 Subject: [PATCH 17/21] always add summary --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 19944e6140..ff0d6cef9c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,6 +25,7 @@ jobs: ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats > docs.tap - name: Summarize Test Results + if: always() uses: pcolby/tap-summary@v1.2.0 with: path: docs.tap From 79bc8d98b1649a04bafe4bce1782b0db3a657420 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:19:33 +0800 Subject: [PATCH 18/21] show full output as well as summary --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ff0d6cef9c..e09abca174 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,9 +22,9 @@ jobs: - name: Run tests run: | export GAMBIT=. - ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats > docs.tap + ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats | tee docs.tap - - name: Summarize Test Results + - name: Summarize tests if: always() uses: pcolby/tap-summary@v1.2.0 with: From 9c63a76863a7384a86daf6299dcc3ff59e6447e4 Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:21:42 +0800 Subject: [PATCH 19/21] tee messes up errcode --- .github/workflows/docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e09abca174..c825faa494 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,10 +22,11 @@ jobs: - name: Run tests run: | export GAMBIT=. - ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats | tee docs.tap + ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats > docs.tap - name: Summarize tests if: always() uses: pcolby/tap-summary@v1.2.0 with: path: docs.tap + run: cat docs.tap From abe5d53b1120ccd2a94e1bfdc262092ae78e4c5c Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:23:34 +0800 Subject: [PATCH 20/21] use pipe status --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c825faa494..e1e0a0ba02 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,11 +22,11 @@ jobs: - name: Run tests run: | export GAMBIT=. - ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats > docs.tap + ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats | tee docs.tap + exit ${PIPESTATUS[0]} - name: Summarize tests if: always() uses: pcolby/tap-summary@v1.2.0 with: path: docs.tap - run: cat docs.tap From f6a48647e89d06a76a9ab34268aaf88cbcd9a87c Mon Sep 17 00:00:00 2001 From: Andrew Fowlie Date: Thu, 13 Feb 2025 15:28:26 +0800 Subject: [PATCH 21/21] add tap summary --- .github/workflows/ci_Mac_arm64.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml index 288b0ce332..01818653e2 100644 --- a/.github/workflows/ci_Mac_arm64.yml +++ b/.github/workflows/ci_Mac_arm64.yml @@ -201,4 +201,11 @@ jobs: run: | source /Users/gambitci/Packages/GBTest_Venv/bin/activate export GAMBIT=. - ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats + ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats | tee results.tap + exit ${PIPESTATUS[0]} + + - name: Summarize tests + if: always() + uses: pcolby/tap-summary@v1.2.0 + with: + path: results.tap