Skip to content

Commit

Permalink
Got LLVM+Clang to work on Windows/Linux ARM.
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny authored Jan 17, 2025
2 parents 5468426 + 44b1978 commit 467852d
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 73 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/buildThirdPartyLibrary.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,34 @@ jobs:
matrix:
include:
- name: 'Windows release (Intel)'
os: windows-latest
os: windows-2022
arch: amd64
build_type: Release
- name: 'Windows debug (Intel)'
os: windows-latest
os: windows-2022
arch: amd64
build_type: Debug
- name: 'Windows release (ARM)'
os: windows-latest
os: windows-2022
arch: amd64_arm64
build_type: Release
- name: 'Windows debug (ARM)'
os: windows-latest
os: windows-2022
arch: amd64_arm64
build_type: Debug
- name: 'Linux (Intel)'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
- name: 'Linux (ARM)'
os: ubuntu-latest
os: ubuntu-22.04
arch: arm
context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
build_type: Release
- name: 'macOS (Intel)'
os: macos-13
build_type: Release
- name: 'macOS (ARM)'
os: macos-latest
os: macos-14
build_type: Release
env:
BUILDCACHE_ACCURACY: STRICT
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
webassembly:
name: WebAssembly
if: ${{ inputs.wasm_support }}
runs-on: macos-latest
runs-on: macos-14
env:
BUILDCACHE_ACCURACY: STRICT
BUILDCACHE_COMPRESS_FORMAT: ZSTD
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,34 @@ jobs:
matrix:
include:
- name: 'Windows static library (Intel)'
os: windows-latest
os: windows-2022
arch: amd64
shared_libs: OFF
- name: 'Windows shared library (Intel)'
os: windows-latest
os: windows-2022
arch: amd64
shared_libs: ON
- name: 'Windows static library (ARM)'
os: windows-latest
os: windows-2022
arch: amd64_arm64
shared_libs: OFF
- name: 'Windows shared library (ARM)'
os: windows-latest
os: windows-2022
arch: amd64_arm64
shared_libs: ON
- name: 'Linux static library (Intel)'
os: ubuntu-latest
os: ubuntu-22.04
shared_libs: OFF
- name: 'Linux shared library (Intel)'
os: ubuntu-latest
os: ubuntu-22.04
shared_libs: ON
- name: 'Linux static library (ARM)'
os: ubuntu-latest
os: ubuntu-22.04
arch: arm
shared_libs: OFF
context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
- name: 'Linux shared library (ARM)'
os: ubuntu-latest
os: ubuntu-22.04
arch: arm
shared_libs: ON
context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
Expand All @@ -54,10 +54,10 @@ jobs:
os: macos-13
shared_libs: ON
- name: 'macOS static library (ARM)'
os: macos-latest
os: macos-14
shared_libs: OFF
- name: 'macOS shared library (ARM)'
os: macos-latest
os: macos-14
shared_libs: ON
env:
BUILDCACHE_ACCURACY: STRICT
Expand Down Expand Up @@ -115,13 +115,13 @@ jobs:
matrix:
include:
- name: 'Windows Python wheels'
os: windows-latest
os: windows-2022
- name: 'Linux Python wheels'
os: ubuntu-latest
os: ubuntu-22.04
- name: 'macOS Python wheels (Intel)'
os: macos-13
- name: 'macOS Python wheels (ARM)'
os: macos-latest
os: macos-14
steps:
- name: Check out libOpenCOR
uses: actions/checkout@v4
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
files: ./wheelhouse/*.whl
webassembly:
name: WebAssembly
runs-on: macos-latest
runs-on: macos-14
env:
BUILDCACHE_ACCURACY: STRICT
BUILDCACHE_COMPRESS_FORMAT: ZSTD
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
include:
- name: 'Windows static library (Intel)'
os: windows-latest
os: windows-2022
arch: amd64
build_type: Release
code_analysis: OFF
Expand All @@ -30,7 +30,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'Windows shared library (Intel)'
os: windows-latest
os: windows-2022
arch: amd64
build_type: Release
code_analysis: OFF
Expand All @@ -46,7 +46,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'Windows static library (ARM) (no tests)'
os: windows-latest
os: windows-2022
arch: amd64_arm64
build_type: Release
code_analysis: OFF
Expand All @@ -62,7 +62,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'Windows shared library (ARM) (no tests)'
os: windows-latest
os: windows-2022
arch: amd64_arm64
build_type: Release
code_analysis: OFF
Expand All @@ -78,7 +78,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'Linux static library (Intel)'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -93,7 +93,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'Linux shared library (Intel)'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -108,7 +108,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'Linux static library (ARM) (no tests)'
os: ubuntu-latest
os: ubuntu-22.04
arch: arm
build_type: Release
code_analysis: OFF
Expand All @@ -125,7 +125,7 @@ jobs:
install_uninstall_and_package: ON
context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
- name: 'Linux shared library (ARM) (no tests)'
os: ubuntu-latest
os: ubuntu-22.04
arch: arm
build_type: Release
code_analysis: OFF
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'macOS static library (ARM)'
os: macos-latest
os: macos-14
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -187,7 +187,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'macOS shared library (ARM)'
os: macos-latest
os: macos-14
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -202,7 +202,7 @@ jobs:
target: unit_testing
install_uninstall_and_package: ON
- name: 'JavaScript bindings'
os: macos-latest
os: macos-14
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -216,7 +216,7 @@ jobs:
unit_testing: OFF
target: javascript_unit_testing
- name: 'Windows Python bindings'
os: windows-latest
os: windows-2022
arch: amd64
build_type: Release
code_analysis: OFF
Expand All @@ -232,7 +232,7 @@ jobs:
target: python_unit_testing
pip_install_test_and_uninstall: ON
- name: 'Linux Python bindings'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
pip_install_prerequisites: sudo pip3 install cmake scikit-build
pip_install_test_and_uninstall: ON
- name: 'macOS Python bindings (ARM)'
os: macos-latest
os: macos-14
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -281,7 +281,7 @@ jobs:
pip_install_prerequisites: sudo pip3 install cmake scikit-build
pip_install_test_and_uninstall: ON
- name: 'Code formatting'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -296,7 +296,7 @@ jobs:
context: PATH=$GITHUB_WORKSPACE:$PATH
target: check_code_formatting
- name: 'JavaScript code formatting'
os: macos-latest
os: macos-14
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -310,7 +310,7 @@ jobs:
unit_testing: OFF
target: javascript_check_code_formatting
- name: 'Python code formatting'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand All @@ -324,7 +324,7 @@ jobs:
unit_testing: OFF
target: python_check_code_formatting
- name: 'Code analysis'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: ON
code_coverage: OFF
Expand All @@ -338,7 +338,7 @@ jobs:
unit_testing: ON
context: PATH=$GITHUB_WORKSPACE:$PATH CC=/usr/local/bin/clang CXX=/usr/local/bin/clang++
- name: 'Code coverage'
os: macos-latest
os: macos-14
build_type: Release
code_analysis: OFF
code_coverage: ON
Expand All @@ -353,7 +353,7 @@ jobs:
context: PATH=/opt/homebrew/opt/llvm/bin:$PATH CC=/opt/homebrew/opt/llvm/bin/clang CXX=/opt/homebrew/opt/llvm/bin/clang++
target: code_coverage
- name: 'Memory checks'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Debug
code_analysis: OFF
code_coverage: OFF
Expand All @@ -367,7 +367,7 @@ jobs:
unit_testing: ON
target: memory_checks
- name: 'Documentation'
os: ubuntu-latest
os: ubuntu-22.04
build_type: Release
code_analysis: OFF
code_coverage: OFF
Expand Down Expand Up @@ -555,7 +555,7 @@ jobs:
run: pip3 uninstall -y libopencor
spell_check:
name: Spell check
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out libOpenCOR
uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit 467852d

Please sign in to comment.