Skip to content

Commit 1f811d2

Browse files
Fix(?) github actions CI
1 parent 5e5f702 commit 1f811d2

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

.github/workflows/cmake.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818

19+
- name: Update apt
20+
run: sudo apt-get update
21+
22+
- name: Install fmtlib
23+
run: sudo apt-get install -y libfmt-dev
24+
25+
- name: Install nasm
26+
run: sudo apt-get install -y nasm
27+
1928
- name: Configure CMake
2029
run: cmake -B ${{github.workspace}}/release -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
2130

test.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
set -eo pipefail
44

5+
if [[ ! "`uname -s`" == "Linux" && ! "`uname -m`" == "x86_64" ]]
6+
then
7+
echo Testing is only supported for Linux x86_64
8+
exit 1
9+
fi
10+
511
if [[ ! -d release ]]
612
then
713
echo Initializing CMake Build Tree...
@@ -13,7 +19,7 @@ cmake --build release -j --config Release
1319

1420
has_failed=0
1521

16-
function test_folder () {
22+
function test_folder {
1723
local folder=$1
1824
echo -e "\nTesting $folder @ `date`"
1925
local failed=0
@@ -31,13 +37,15 @@ function test_folder () {
3137
continue
3238
fi
3339
local output=`cat $f | grep '^# output: ' | sed 's/^# output: //g'`
34-
if [ ! "$(./release/exsi $f)" = "$output" ]
40+
./release/exsi nasm-linux-x86_64 "$f"
41+
local real=`echo "./$f" | sed 's/\.xes//g'`
42+
if [ ! "`$real`" = "$output" ]
3543
then
3644
printf "\e[31mFAILED!\e[0m\n"
3745
printf "Expected:\n"
3846
printf "$output\n"
3947
printf "Got:\n"
40-
printf "$(./release/exsi $f)\n"
48+
printf "`$real`\n"
4149
failed=$((failed+1))
4250
has_failed=1
4351
else

0 commit comments

Comments
 (0)