mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-05-25 18:00:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

ci: macos-latest is now arm64 and breaks, use macos-12 for now

Browse Source
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2024-05-05 13:19:25 +03:00
parent 58916d3c6d
commit a14e21dff6
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/binaries.yml vendored
View File

@ -92,7 +92,7 @@ jobs:
asmnasm: /Users/runner/nasm/nasm asmnasm: /Users/runner/nasm/nasm
output: sointu-compile output: sointu-compile
params: cmd/sointu-compile/main.go params: cmd/sointu-compile/main.go
- os: macos-latest - os: macos-12 # this is intel still
asmnasm: /Users/runner/nasm/nasm asmnasm: /Users/runner/nasm/nasm
output: sointu-track-native output: sointu-track-native
params: -tags=native cmd/sointu-track/main.go params: -tags=native cmd/sointu-track/main.go

2
.github/workflows/tests.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
asmnasm: C:\Users\runneradmin\nasm\nasm asmnasm: C:\Users\runneradmin\nasm\nasm
gotests: yes gotests: yes
cgo_ldflags: cgo_ldflags:
- os: macos-latest - os: macos-12 # this is intel still
asmnasm: /Users/runner/nasm/nasm asmnasm: /Users/runner/nasm/nasm
gotests: yes gotests: yes
cgo_ldflags: # -Wl,-no_pie cgo_ldflags: # -Wl,-no_pie

2
CMakeLists.txt
View File

@ -26,6 +26,8 @@ endif()
IF(APPLE) IF(APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie")
# https://stackoverflow.com/questions/69803659/what-is-the-proper-way-to-build-for-macos-x86-64-using-cmake-on-apple-m1-arm
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE)
endif() endif()
find_program(GO NAMES go) find_program(GO NAMES go)