Updated workflows to run with updated macOS

spcaipers-arm · web-flow · commit 45b4126c452a · 2024-11-07T14:49:50.000+01:00
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)
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "runs_on":"macos-12",`
	`3`	`+ "runs_on":"macos-13",`
`4`	`4`	`"target":"darwin",`
`5`	`5`	`"arch": "amd64",`
`6`	`6`	`"binary_extension":".mac-amd64",`
`@@ -10,7 +10,7 @@`
`10`	`10`	`"runOn": "publicRepo"`
`11`	`11`	`},`
`12`	`12`	`{`
`13`		`- "runs_on":"macos-12",`
	`13`	`+ "runs_on":"macos-14",`
`14`	`14`	`"target":"darwin",`
`15`	`15`	`"arch": "arm64",`
`16`	`16`	`"binary_extension":".mac-arm64",`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "runs_on":"macos-12",`
	`3`	`+ "runs_on":"macos-13",`
`4`	`4`	`"target":"darwin",`
`5`	`5`	`"arch": "amd64",`
`6`	`6`	`"runOn": "publicRepo"`
`7`	`7`	`},`
`8`	`8`	`{`
`9`		`- "runs_on":"macos-12",`
	`9`	`+ "runs_on":"macos-14",`
`10`	`10`	`"target":"darwin",`
`11`	`11`	`"arch": "arm64",`
`12`	`12`	`"runOn": "publicRepo"`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "runs_on":"macos-12",`
	`3`	`+ "runs_on":"macos-13",`
`4`	`4`	`"target":"darwin",`
`5`	`5`	`"arch": "amd64",`
`6`	`6`	`"binary": "packgen",`
`7`	`7`	`"runOn": "publicRepo"`
	`8`	`+`
`8`	`9`	`},`
`9`	`10`	`{`
`10`		`- "runs_on":"macos-12",`
	`11`	`+ "runs_on":"macos-14",`
`11`	`12`	`"target":"darwin",`
`12`	`13`	`"arch": "arm64",`
`13`	`14`	`"binary": "packgen",`