Merge remote-tracking branch 'origin/master' into donttrythisathome

This commit is contained in:
Sean Harmeyer 2025-01-16 08:57:10 -06:00
commit c4a32615e5
13 changed files with 56 additions and 20 deletions

View File

@ -141,7 +141,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`

View File

@ -32,7 +32,7 @@ jobs:
dnf install -y gtest-devel gmock-devel
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Configure Trick
run: |

View File

@ -140,7 +140,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Info after checkout
run: |
pwd

View File

@ -19,7 +19,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Install python
run: |
brew install python

View File

@ -26,9 +26,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: dorny/test-reporter@v1
- name: Checkout the repository
uses: actions/checkout@v4
- name: Download the artifact
uses: actions/download-artifact@v4
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}
path: . # download the artifact in the current directory
- name: Report the test results
uses: dorny/test-reporter@v1
with:
artifact: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # artifact name
name: Results_Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # Name of the check run which will be created
path: '*.xml' # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results

View File

@ -20,9 +20,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: dorny/test-reporter@v1
- name: Checkout the repository
uses: actions/checkout@v4
- name: Download the artifact
uses: actions/download-artifact@v4
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}
path: . # download the artifact in the current directory
- name: Report the test results
uses: dorny/test-reporter@v1
with:
artifact: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # artifact name
name: Results_Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # Name of the check run which will be created
path: '*.xml' # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results

View File

@ -20,9 +20,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: dorny/test-reporter@v4
- name: Checkout the repository
uses: actions/checkout@v4
- name: Download the artifact
uses: actions/download-artifact@v4
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}
path: . # download the artifact in the current directory
- name: Report the test results
uses: dorny/test-reporter@v1
with:
artifact: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # artifact name
name: Results_Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # Name of the check run which will be created
path: '*.xml' # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results

View File

@ -12,9 +12,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: dorny/test-reporter@v1
- name: Checkout the repository
uses: actions/checkout@v4
- name: Download the artifact
uses: actions/download-artifact@v4
with:
name: Trick_macos
path: . # download the artifact in the current directory
- name: Report the test results
uses: dorny/test-reporter@v1
with:
artifact: Trick_macos # artifact name
name: Results_Trick_macos # Name of the check run which will be created
path: '*.xml' # Path to test results (inside artifact .zip)
reporter: java-junit # Format of test results

View File

@ -56,7 +56,7 @@ jobs:
make
make install
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Trick
run: |
export CFLAGS="-m32"

View File

@ -129,7 +129,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`

View File

@ -129,7 +129,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`
@ -145,7 +145,7 @@ jobs:
python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}

View File

@ -16,7 +16,7 @@ jobs:
runs-on: macos-13
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install gtest
run: |
brew install googletest

View File

@ -31,10 +31,10 @@ jobs:
source ../.venv/bin/activate
export PATH="/tmp/koviz-master/bin:${PATH}"
./run_tests.py
- uses: actions/upload-artifact@v3.0.0
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: doctests
name: doctests_${{ github.run_id }}_${{ github.job }}
path: |
share/trick/trickops/tests/*_doctest_log.txt
/tmp/log.*
@ -66,7 +66,7 @@ jobs:
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: doctests
name: doctests_${{ github.run_id }}_${{ github.job }}
path: |
share/trick/trickops/tests/*_doctest_log.txt
/tmp/log.*