Add build-arch and simplify profile

biovault · Sep 23, 2024 · e001fd0 · e001fd0
1 parent ebd8703
commit e001fd0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.github/conan_linuxmac_build/action.yml b/.github/conan_linuxmac_build/action.yml
@@ -23,6 +23,9 @@ inputs:
   conan-build-os:
     description: "Linux or Macos"
     required: true
+  build-arch:
+    description: "either x86_64 or armv8 (for macos)"
+    required: true
   conan-user:
     description: "pass secrets.LKEB_ARTIFACTORY_USER"
     required: true
@@ -67,9 +70,7 @@ runs:
 
         conan profile new action_build
         conan profile update settings.os=${{ inputs.conan-build-os }} action_build
-        conan profile update settings.os_build=${{ inputs.conan-build-os }} action_build
-        conan profile update settings.arch=x86_64 action_build
-        conan profile update settings.arch_build=x86_64 action_build
+        conan profile update settings.arch=${{ inputs.build-arch }} action_build
         conan profile update settings.compiler=${{ inputs.conan-compiler }} action_build
         conan profile update settings.compiler.version=${{ inputs.conan-compiler-version }} action_build
         conan profile update settings.compiler.libcxx=${{ inputs.conan-libcxx-version}} action_build

diff --git a/.github/conan_windows_build/action.yml b/.github/conan_windows_build/action.yml
@@ -8,6 +8,9 @@ inputs:
   conan-build-type:
     description: "Empty or Analysis"
     required: false
+  build-arch:
+    description: "either x86_64 or armv8 (for macos)"
+    required: true
   conan-user:
     description: "pass secrets.LKEB_ARTIFACTORY_USER"
     required: true
@@ -62,9 +65,7 @@ runs:
         conan user -r %CONAN_LKEB_ARTIFACTORY% -p ${{ inputs.conan-password }} ${{ inputs.conan-user }}
         conan profile new action_build
         conan profile update settings.os=Windows action_build
-        conan profile update settings.os_build=Windows action_build
-        conan profile update settings.arch=x86_64 action_build
-        conan profile update settings.arch_build=x86_64 action_build
+        conan profile update settings.arch=${{ inputs.build-arch }}action_build
         conan profile update settings.compiler="Visual Studio" action_build
         conan profile update settings.compiler.version=${{ inputs.conan-visual-version }} action_build
         conan profile show action_build

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,13 +41,15 @@ jobs:
             build-cversion: 16
             build-runtime: MD
             build-config: Release
+            build-arch: x86_64
 
           - name: Windows-msvc2022
             os: windows-2022
             compiler: msvc-2022
             build-cversion: 17
             build-runtime: MD
             build-config: Release
+            build-arch: x86_64
 
           - name: Linux_gcc10
             os: ubuntu-20.04
@@ -56,6 +58,7 @@ jobs:
             build-config: Release
             build-os: Linux
             build-libcxx: libstdc++11
+            build-arch: x86_64
 
           - name: Linux_gcc11
             os: ubuntu-22.04
@@ -66,6 +69,7 @@ jobs:
             build-config: Release
             build-os: Linux
             build-libcxx: libstdc++11
+            build-arch: x86_64
 
           - name: Macos_xcode13.4
             os: macos-12
@@ -75,6 +79,7 @@ jobs:
             build-os: Macos
             build-xcode-version: 13.4
             build-libcxx: libc++
+            build-arch: x86_64
 
           - name: Macos_xcode14.3
             os: macos-13
@@ -84,6 +89,7 @@ jobs:
             build-os: Macos
             build-xcode-version: 14.3
             build-libcxx: libc++
+            build-arch: x86_64
 
           - name: Macos_xcode15
             os: macos-14
@@ -93,6 +99,7 @@ jobs:
             build-os: Macos
             build-xcode-version: 15.4
             build-libcxx: libc++
+            build-arch: armv8
 
     steps:
       - name: Checkout the source
@@ -123,6 +130,7 @@ jobs:
         with:
           conan-visual-version: ${{matrix.build-cversion}}
           conan-build-type: ${{matrix.build-config}}
+          build-arch: ${{matrix.build-arch}}
           conan-user: ${{secrets.LKEB_ARTIFACTORY_USER}}
           conan-password: ${{secrets.LKEB_ARTIFACTORY_PASSWORD}}
           hdilib-cdash-token: ${{secrets.HDILIB_TOKEN}}
@@ -136,5 +144,6 @@ jobs:
           conan-libcxx-version: ${{matrix.build-libcxx}}
           conan-build-type: ${{matrix.build-config}}
           conan-build-os: ${{matrix.build-os}}
+          build-arch: ${{matrix.build-arch}}
           conan-user: ${{secrets.LKEB_ARTIFACTORY_USER}}
           conan-password: ${{secrets.LKEB_ARTIFACTORY_PASSWORD}}