Fix

Author: tobil4sk

.github/workflows/main.yml

@@ -109,14 +109,14 @@ jobs:
       matrix:
         haxe: [ 4.3.7, latest ]
     uses: ./.github/workflows/test.yml
-    name: Test Linux (32bit)
+    name: Test Android (x86_64)
     with:
       haxe: ${{ matrix.haxe  }}
       arch: 64
       sep: /
       ext: .dso
       os: ubuntu-latest
-      haxe_flags: -D android
+      target_flag: android
       execute: false
 
   AndroidArm64:
@@ -125,12 +125,12 @@ jobs:
       matrix:
         haxe: [ 4.3.7, latest ]
     uses: ./.github/workflows/test.yml
-    name: Test Linux (64bit)
+    name: Test Android (Arm64)
     with:
       haxe: ${{ matrix.haxe  }}
       arch: Arm64
       sep: /
       ext: .dso
       os: ubuntu-latest
-      haxe_flags: -D android
+      target_flag: android
       execute: false

.github/workflows/test.yml

@@ -17,7 +17,7 @@ on:
       os:
         required: true
         type: string
-      haxe_flags:
+      target_flag:
         type: string
         default: ''
       execute:
@@ -26,6 +26,8 @@ on:
 
 env:
   HXCPP_ARCH_FLAG: ${{ inputs.arch == 'Arm64' && 'HXCPP_ARM64' || format('HXCPP_M{0}', inputs.arch) }}
+  HAXE_TARGET_FLAG: ${{ inputs.target_flag == '' && format('-D {0}', inputs.target_flag) || '' }}
+  HXCPP_TARGET_FLAG: ${{ inputs.target_flag == '' && format('-D{0}', inputs.target_flag) || '' }}
 
 jobs:
   haxe:
@@ -42,7 +44,7 @@ jobs:
         with:
           haxe: ${{ inputs.haxe }}
       - name: build
-        run: haxe compile.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }}
+        run: haxe compile.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: run
         if: inputs.execute
         run: bin${{ inputs.sep }}TestMain
@@ -62,13 +64,13 @@ jobs:
           haxe: ${{ inputs.haxe }}
       - name: build project
         working-directory: test/cffi/project
-        run: haxelib run hxcpp build.xml -Ddebug -D${{ env.HXCPP_ARCH_FLAG }} ${{ replace(inputs.haxe_flags, ' ', '') }}
+        run: haxelib run hxcpp build.xml -Ddebug -D${{ env.HXCPP_ARCH_FLAG }} ${{ env.HXCPP_TARGET_FLAG }}
       - name: build
-        run: haxe compile.hxml --debug -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }} 
+        run: haxe compile.hxml --debug -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: build (utf8)
-        run: haxe compile-utf8.hxml --debug -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }} 
+        run: haxe compile-utf8.hxml --debug -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: build (neko)
-        run: haxe compile-neko.hxml --debug -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }} 
+        run: haxe compile-neko.hxml --debug -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: copy
         if: inputs.execute
         run: cp project/ndll/*/prime${{ inputs.ext }} bin/neko/prime.ndll
@@ -104,7 +106,7 @@ jobs:
         with:
           haxe: ${{ inputs.haxe }}
       - name: build
-        run: haxe compile.hxml ${{ matrix.suffix }} -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }}
+        run: haxe compile.hxml ${{ matrix.suffix }} -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: run
         if: inputs.execute
         run: bin${{ inputs.sep }}TestMain${{ matrix.suffix }}
@@ -123,7 +125,7 @@ jobs:
         with:
           haxe: ${{ inputs.haxe }}
       - name: build
-        run: haxe compile.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }} 
+        run: haxe compile.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: run
         if: inputs.execute
         run: bin${{ inputs.sep }}App-debug
@@ -142,7 +144,7 @@ jobs:
           with:
             haxe: ${{ inputs.haxe }}
         - name: build
-          run: haxe compile.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }} 
+          run: haxe compile.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
         - name: run
           if: inputs.execute
           run: bin${{ inputs.sep }}Native
@@ -169,7 +171,7 @@ jobs:
             sudo systemctl start mariadb
             sudo mariadb -u root -e "create database hxcpp; grant all privileges on hxcpp.* to hxcpp@localhost identified by 'hxcpp'; flush privileges;"
         - name: build
-          run: haxe compile${{ inputs.arch }}.hxml ${{ inputs.haxe_flags }}
+          run: haxe compile${{ inputs.arch }}.hxml ${{ env.HAXE_TARGET_FLAG }}
         - name: run
           if: inputs.execute
           run: ${{ inputs.arch == 'Arm64' && 'arm64' || format('cpp{0}', inputs.arch) }}${{ inputs.sep }}Test
@@ -195,9 +197,9 @@ jobs:
         with:
           haxe: ${{ inputs.haxe }}
       - name: build host
-        run: haxe compile-host.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }}
+        run: haxe compile-host.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: build client
-        run: haxe compile-client.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ inputs.haxe_flags }}
+        run: haxe compile-client.hxml -D ${{ env.HXCPP_ARCH_FLAG }} ${{ env.HAXE_TARGET_FLAG }}
       - name: run
         if: inputs.execute
         run: bin${{ inputs.sep }}CppiaHost bin${{ inputs.sep }}client.cppia ${{ matrix.suffix }}
@@ -233,7 +235,7 @@ jobs:
         # haxe 4 tests don't build with latest utest
         if: inputs.haxe != 'latest'
       - name: build
-        run: haxe compile-cpp.hxml -D ${{ env.HXCPP_ARCH_FLAG }} -D no_http ${{ inputs.haxe_flags }}
+        run: haxe compile-cpp.hxml -D ${{ env.HXCPP_ARCH_FLAG }} -D no_http ${{ env.HAXE_TARGET_FLAG }}
       - name: run
         if: inputs.execute
         run: bin${{ inputs.sep }}cpp${{ inputs.sep }}TestMain-debug
@@ -252,6 +254,6 @@ jobs:
         shell: bash
         run: |
           for xml in *.xml; do
-            haxelib run hxcpp $xml ${{ replace(inputs.haxe_flags, ' ', '') }}
+            haxelib run hxcpp $xml ${{ env.HXCPP_TARGET_FLAG }}
             haxelib run hxcpp $xml clean
           done