3 files changed, 78 insertions, 11 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index 41ab0059c..cf391324e 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -119,6 +119,32 @@ instructions:
       variableName: LLVM_INSTALL_DIR
       variableValue: "{{.Env.LLVM_DYNAMIC_LIBS_100}}"
       disable_if:
+        condition: and
+        conditions:
+          - condition: property
+            property: target.arch
+            equals_value: X86_64-ARM64 # When target arch is universal binary, we can use the default libclang
+          - condition: property
+            property: host.os
+            equals_value: MacOS
+    - type: EnvironmentVariable
+      variableName: LLVM_INSTALL_DIR
+      variableValue: "/Users/qt/libclang-dynlibs-10.0-universal/libclang-dynlibs-10.0"
+      enable_if:
+        condition: and
+        conditions:
+          - condition: property
+            property: target.arch
+            equals_value: X86_64-ARM64 # When target arch is universal binary, we can use the default libclang
+          - condition: property
+            property: host.os
+            equals_value: MacOS
+    - type: PrependToEnvironmentVariable
+      variableName: PATH
+      variableValue: "/Library/Frameworks/Python.framework/Versions/3.9/bin:"
+      enable_if:
          condition: property
-         property: host.osVersion
-         equals_value: openSUSE_15_1
+         property: host.os
+         equals_value: MacOS
+
+
diff --git a/coin/instructions/execute_build_instructions.yaml b/coin/instructions/execute_build_instructions.yaml
index e940e9250..ffd1ad5cc 100644
--- a/coin/instructions/execute_build_instructions.yaml
+++ b/coin/instructions/execute_build_instructions.yaml
@@ -1,13 +1,34 @@
 type: Group
 instructions:
   - type: ExecuteCommand
-    command: "python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install  --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL"
+    command: "python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install  --targetOs={{.Env.CI_OS}} --hostArch={{.Env.HOS_ARCH_COIN}} --targetArch={{.Env.TARGET_ARCH_COIN}} --phase=ALL"
     maxTimeInSeconds: 14400
     maxTimeBetweenOutput: 1200
     enable_if:
-        condition: property
-        property: host.os
-        equals_value: MacOS
+        condition: and
+        conditions:
+        - condition: property
+          property: target.arch
+          equals_value: X86_64
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+    userMessageOnFailure: >
+         Failed to execute build instructions on osx
+
+  - type: ExecuteCommand
+    command: "python3 -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} {{.Env.CI_USE_SCCACHE}} --instdir=/Users/qt/work/install  --targetOs={{.Env.CI_OS}} --hostArch=={{.Env.HOST_ARCH_COIN}} --targetArch=X86_64-ARM64 --phase=ALL"
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 1200
+    enable_if:
+        condition: and
+        conditions:
+        - condition: property
+          property: target.arch
+          equals_value: X86_64-ARM64
+        - condition: property
+          property: host.os
+          equals_value: MacOS
     userMessageOnFailure: >
          Failed to execute build instructions on osx
   - type: ExecuteCommand
diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml
index f5dd7aa50..b30ec2b92 100644
--- a/coin/instructions/execute_test_instructions.yaml
+++ b/coin/instructions/execute_test_instructions.yaml
@@ -8,15 +8,35 @@ instructions:
     variableName: QTEST_ENVIRONMENT
     variableValue: "ci"
   - type: ExecuteCommand
-    command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}"
+    command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.TARGET_ARCH_COIN}}"
     maxTimeInSeconds: 14400
     maxTimeBetweenOutput: 1200
     enable_if:
-        condition: property
-        property: host.os
-        equals_value: MacOS
+        condition: and
+        conditions:
+        - condition: property
+          property: target.arch
+          equals_value: X86_64
+        - condition: property
+          property: host.os
+          equals_value: MacOS
+    userMessageOnFailure: >
+        Failed to execute test instructions on osx
+  - type: ExecuteCommand
+    command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch=X86_64-ARM64"
+    maxTimeInSeconds: 14400
+    maxTimeBetweenOutput: 1200
+    enable_if:
+        condition: and
+        conditions:
+        - condition: property
+          property: target.arch
+          equals_value: X86_64-ARM64
+        - condition: property
+          property: host.os
+          equals_value: MacOS
     userMessageOnFailure: >
-         Failed to execute test instructions on osx
+        Failed to execute test instructions on osx
   - type: ExecuteCommand
     command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}"
     maxTimeInSeconds: 14400