Skip to content

Commit 8326f87

Browse files
committed
[ci] Fix passing arch flag to std tests
1 parent 92c8520 commit 8326f87

5 files changed

Lines changed: 11 additions & 14 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ jobs:
174174
sudo systemctl start mariadb
175175
sudo mariadb -u root -e "create database hxcpp; grant all privileges on hxcpp.* to hxcpp@localhost identified by 'hxcpp'; flush privileges;"
176176
- name: build
177-
run: haxe compile${{ inputs.arch }}.hxml ${{ env.HAXE_TARGET_FLAG }}
177+
run: haxe compile-generic.hxml -cpp bin -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
178178
- name: run
179179
if: inputs.execute
180-
run: ${{ inputs.arch == 'Arm64' && 'arm64' || format('cpp{0}', inputs.arch) }}${{ inputs.sep }}Test
180+
run: bin${{ inputs.sep }}Test
181181

182182
cppia:
183183
strategy:

test/std/compile-generic.hxml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-m Test
2+
-D HXCPP_DEBUGGER
3+
-L hx4compat
4+
-L utest

test/std/compile32.hxml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
-m Test
1+
compile-generic.hxml
22
-D HXCPP_M32
3-
-D HXCPP_DEBUGGER
4-
-L hx4compat
5-
-L utest
6-
--cpp cpp32
3+
--cpp cpp32

test/std/compile64.hxml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
-m Test
1+
compile-generic.hxml
22
-D HXCPP_M64
3-
-L hx4compat
4-
-L utest
5-
--cpp cpp64
3+
--cpp cpp64

test/std/compileArm64.hxml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
-m Test
1+
compile-generic.hxml
22
-D HXCPP_ARM64
3-
-L hx4compat
4-
-L utest
53
--cpp arm64

0 commit comments

Comments
 (0)