Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitHub CI: Reinstate Toooba test for macos-13 #676

Merged
merged 2 commits into from
Feb 25, 2024
Merged

GitHub CI: Reinstate Toooba test for macos-13 #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff2315e
GitHub CI: Reinstate Toooba test for macos-13
quark17 Feb 25, 2024
5f9ff7e
GitHub CI: Cleanup the Toooba test jobs
quark17 Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/build-and-test-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ jobs:
name: "Test Toooba ${{ inputs.os }} ghc-${{ inputs.ghc_version }}"
runs-on: ${{ inputs.os }}
timeout-minutes: 60
if: ${{ inputs.os != 'macos-13' }}
needs: build-macos
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -247,11 +246,10 @@ jobs:
run: |
export PATH=$PWD/../bsc/inst/bin:$PATH

cd ../Toooba/Tests/elf_to_hex
# Workaround limitation in the Makefile for Homebrew on older macOS
export CPATH=/usr/local/include/libelf

make CPATH=/usr/local/include/libelf

cd ../../builds/RV64ACDFIMSU_Toooba_bluesim/
cd ../Toooba/builds/RV64ACDFIMSU_Toooba_bluesim/

# Workaround bugs in the regression script
#make isa_tests | tee isa_tests.log
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/build-and-test-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,7 @@ jobs:
run: |
export PATH=$PWD/../bsc/inst/bin:$PATH

cd ../Toooba/Tests/elf_to_hex

# Workaround a build failure on Ubuntu 22.04
REL=$(lsb_release -rs | tr -d .)
if [ $REL -lt 2204 ]; then
make
else
gcc -g -o elf_to_hex elf_to_hex.c -lelf -mcmodel=medium
fi

cd ../../builds/RV64ACDFIMSU_Toooba_bluesim/
cd ../Toooba/builds/RV64ACDFIMSU_Toooba_bluesim/

# Workaround bugs in the regression script
#make isa_tests | tee isa_tests.log
Expand Down