Updated workflows to run with updated macOS

Open-CMSIS-Pack · Nov 7, 2024 · 45b4126 · 45b4126
1 parent 96ec339
commit 45b4126
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/.github/matrix_includes_buildmgr.json b/.github/matrix_includes_buildmgr.json
@@ -1,6 +1,6 @@
 [
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-13",
         "target":"darwin",
         "arch": "amd64",
         "binary_extension":".mac-amd64",
@@ -10,7 +10,7 @@
         "runOn": "publicRepo"
     },
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-14",
         "target":"darwin",
         "arch": "arm64",
         "binary_extension":".mac-arm64",

diff --git a/.github/matrix_includes_packchk.json b/.github/matrix_includes_packchk.json
@@ -1,12 +1,12 @@
 [
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-13",
         "target":"darwin",
         "arch": "amd64",
         "runOn": "publicRepo"
     },
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-14",
         "target":"darwin",
         "arch": "arm64",
         "runOn": "publicRepo"

diff --git a/.github/matrix_includes_packgen.json b/.github/matrix_includes_packgen.json
@@ -1,13 +1,14 @@
 [
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-13",
         "target":"darwin",
         "arch": "amd64",
         "binary": "packgen",
         "runOn": "publicRepo"
+
     },
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-14",
         "target":"darwin",
         "arch": "arm64",
         "binary": "packgen",

diff --git a/.github/matrix_includes_projmgr.json b/.github/matrix_includes_projmgr.json
@@ -1,6 +1,6 @@
 [
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-13",
         "target":"darwin",
         "arch": "amd64",
         "binary": "csolution",
@@ -9,7 +9,7 @@
         "goswig": true
     },
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-14",
         "target":"darwin",
         "arch": "arm64",
         "binary": "csolution",

diff --git a/.github/matrix_includes_svdconv.json b/.github/matrix_includes_svdconv.json
@@ -1,12 +1,12 @@
 [
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-13",
         "target":"darwin",
         "arch": "amd64",
         "runOn": "publicRepo"
     },
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-14",
         "target":"darwin",
         "arch": "arm64",
         "runOn": "publicRepo"

diff --git a/.github/matrix_includes_test_libs.json b/.github/matrix_includes_test_libs.json
@@ -1,12 +1,12 @@
 [
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-13",
         "target":"darwin",
         "arch": "amd64",
         "runOn": "publicRepo"
     },
     {
-        "runs_on":"macos-12",
+        "runs_on":"macos-14",
         "target":"darwin",
         "arch": "arm64",
         "runOn": "publicRepo"

diff --git a/tools/projmgr/swig/go/CMakeLists.txt b/tools/projmgr/swig/go/CMakeLists.txt
@@ -1,7 +1,7 @@
 find_package(SWIG REQUIRED)
 include(${SWIG_USE_FILE})
 
-set(CMAKE_SWIG_FLAGS -c++ -go -cgo -intgosize 64 -D${CMAKE_SYSTEM_NAME})
+set(CMAKE_SWIG_FLAGS -c++ -cgo -intgosize 64 -D${CMAKE_SYSTEM_NAME})
 include_directories(projmgr-go PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${PROJECT_BINARY_DIR})
 set_source_files_properties(projmgr.i PROPERTIES CPLUSPLUS ON)