Skip to content

Commit 6019e5b

Browse files
hanniavaleraHannia Valera
andauthored
Update macOS CI image (#4633)
* Update macOS CI image * installing cmake and ninja to align with host architecture * fix runner bug * more bug fixes * updating versions to 3.10 to prevent more errors * accidentally broke a test * running only on the latest macos * updated changelog * missed a comment * accidentally deleted lint, fixing it * took in feedback, removed redundant and unncessary workflow additions * correct version for macos * reverting unnecessary changes --------- Co-authored-by: Hannia Valera <[email protected]>
1 parent e69b74e commit 6019e5b

14 files changed

Lines changed: 14 additions & 13 deletions

File tree

.github/workflows/ci-main-mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: macos-13 # TODO: This is a workaround until macos-14 is fixed: https://github.com/actions/runner-images/issues/10624
11+
runs-on: macos-15
1212

1313
steps:
1414
- uses: actions/checkout@v3

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Bug Fixes:
4040
- Fix bug that shows empty lines in Pinned Commands view. [#4406](https://github.com/microsoft/vscode-cmake-tools/issues/4406)
4141
- Fix Compiler Warnings not shown in Problems Window [#4567]https://github.com/microsoft/vscode-cmake-tools/issues/4567
4242
- Fix bug in which clicking "Run Test" for filtered tests executed all tests instead [#4501](https://github.com/microsoft/vscode-cmake-tools/pull/4501) [@hippo91](https://github.com/hippo91)
43+
- Migrate macOS CI from deprecated macOS-13 to macOS-15 Image [#4633](https://github.com/microsoft/vscode-cmake-tools/pull/4633)
4344

4445
## 1.20.53
4546

test/end-to-end-tests/multi-root-UI/project-folder-1/subroot1/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestBuildProcess VERSION 0.1.0)
33

44
set(CMT_COOKIE passed-cookie CACHE STRING "Cookie to be written by the main executable")

test/end-to-end-tests/multi-root-UI/project-folder-1/subroot2/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestBuildProcess VERSION 0.1.0)
33

44
set(CMT_COOKIE passed-cookie CACHE STRING "Cookie to be written by the main executable")

test/end-to-end-tests/multi-root-UI/project-folder-2/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestBuildProcess VERSION 0.1.0)
33

44
set(CMT_COOKIE passed-cookie CACHE STRING "Cookie to be written by the main executable")

test/end-to-end-tests/single-root-UI/project-folder/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestBuildProcess VERSION 0.1.0)
33

44
set(CMT_COOKIE passed-cookie CACHE STRING "Cookie to be written by the main executable")

test/end-to-end-tests/successful-build/project-folder/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestBuildProcess VERSION 0.1.0)
33

44
set(CMT_COOKIE passed-cookie CACHE STRING "Cookie to be written by the main executable")

test/fakeOutputGenerator/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.15.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(FakeOutputGenerator VERSION 0.1.0)
33

44
file(GLOB CONFIG_FILES "configfiles/*.cfg")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestProject VERSION 0.1)
33

44
bad_command()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2)
1+
cmake_minimum_required(VERSION 3.10.0)
22
project(TestProject VERSION 0.1)
33

44
add_executable(test-exe main.cpp)

0 commit comments

Comments
 (0)