Skip to content

Commit 494e6e9

Browse files
authored
fix: all pipeline failures (#1221)
* fix: update conditional static assertion There is a static assertion that spuriously fails on MSVC that was version checked. Unfortunately it fires every time there is a new compiler update, so for now we will remove the version check and add it back once the compiler bug is fixed. * fix: ios pipeline failure Looks like somewhere along the line, the iOS simulator changed the range of support iOS versions. This changes bumps the version from 9 to 12.0. Also noticed that the GSL OSX bundle version was quite out of date. I bumped this from 3.1.0 to 4.2.0 and created an upgrade checklist file in docs/ so we don't forget these types of tasks in the future. * bump xcode version from 15.4 to 16.4 * fix compiler warning when building gtest for ios * allow for missing include dirs on command line * replace windows-2019 with windows-2025 * update visual studio versions after runner bump * PR feedback: make sure markdown links are syntactically correct
1 parent 7e0943d commit 494e6e9

File tree

4 files changed

+31
-17
lines changed

4 files changed

+31
-17
lines changed

.github/workflows/compilers.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
xcode:
6666
strategy:
6767
matrix:
68-
xcode_version: [ '15.4' ]
68+
xcode_version: [ '16.4' ]
6969
build_type: [ Debug, Release ]
7070
cxx_version: [ 14, 17, 20, 23 ]
7171
runs-on: macos-latest
@@ -81,22 +81,16 @@ jobs:
8181
cmake_build_type: ${{ matrix.build_type }}
8282
cmake_cxx_compiler: clang++
8383
gsl_cxx_standard: ${{ matrix.cxx_version }}
84+
extra_cmake_args: '-DCMAKE_CXX_FLAGS="-isysroot \"$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk\""'
8485

8586
VisualStudio:
8687
strategy:
8788
matrix:
88-
generator: [ 'Visual Studio 16 2019', 'Visual Studio 17 2022' ]
89-
image: [ windows-2019, windows-2022 ]
89+
generator: [ 'Visual Studio 17 2022' ]
90+
image: [ windows-2022, windows-2025 ]
9091
build_type: [ Debug, Release ]
9192
extra_args: [ '', '-T ClangCL' ]
9293
cxx_version: [ 14, 17, 20, 23 ]
93-
exclude:
94-
- generator: 'Visual Studio 17 2022'
95-
image: windows-2019
96-
- generator: 'Visual Studio 16 2019'
97-
image: windows-2022
98-
- generator: 'Visual Studio 16 2019'
99-
cxx_version: 23
10094
runs-on: ${{ matrix.image }}
10195
steps:
10296
- uses: actions/checkout@v4

.github/workflows/ios.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ jobs:
2525
-GXcode \
2626
-DCMAKE_SYSTEM_NAME=iOS \
2727
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
28-
-DCMAKE_OSX_DEPLOYMENT_TARGET=9 \
28+
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 \
2929
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
3030
"-DMACOSX_BUNDLE_GUI_IDENTIFIER=GSL.\$(EXECUTABLE_NAME)" \
31-
-DMACOSX_BUNDLE_BUNDLE_VERSION=3.1.0 \
32-
-DMACOSX_BUNDLE_SHORT_VERSION_STRING=3.1.0 \
31+
-DMACOSX_BUNDLE_BUNDLE_VERSION=4.2.0 \
32+
-DMACOSX_BUNDLE_SHORT_VERSION_STRING=4.2.0 \
33+
-DCMAKE_CXX_FLAGS="-Wno-missing-include-dirs" \
3334
..
3435
3536
- name: Build

docs/upgrade_checklist.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
> When bumping the version, you need to update the following files:
2+
3+
1. [ ] [CMakeLists.txt](../CMakeLists.txt) Bump `GSL_VERSION`
4+
1. [ ] [README.md](../README.md) Bump `GIT_TAG`
5+
1. [ ] [ios.yml](../.github/workflows/ios.yml) Bump `MACOSX_BUNDLE_BUNDLE_VERSION` and
6+
`MACOSX_BUNDLE_SHORT_VERSION_STRING`
7+
8+
> After updating, you need to create a new GitHub release:
9+
10+
1. [ ] [Microsoft/GSL - Create Release](https://github.com/microsoft/GSL/releases/new)
11+
12+
Be sure to update the release notes accordingly and properly mention open-source
13+
contributors.
14+
15+
> After a new release exists, update the `ms-gsl` vcpkg port:
16+
17+
1. [ ] [Microsoft/vcpkg - ms-gsl port](https://github.com/microsoft/vcpkg/tree/master/ports/ms-gsl)
18+
19+
Be sure to monitor the PR that updates the port for any feedback from vcpkg maintainers.

tests/span_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ TEST(span_test, from_std_array_constructor)
412412
static_assert(!CtorCompilesFor<span<int, 5>, std::array<int, 4>&>,
413413
"!CtorCompilesFor<span<int, 5>, std::array<int, 4>&>");
414414

415-
#if !defined(_MSC_VER) || (_MSC_VER > 1943) || (__cplusplus >= 201703L)
416-
// Fails on "Visual Studio 16 2019/Visual Studio 17 2022, windows-2019/2022, Debug/Release, 14".
415+
#if !defined(_MSC_VER) || (__cplusplus >= 201703L)
416+
// Fails on MSVC. TODO: report a feedback bug.
417417
static_assert(!ConversionCompilesFor<span<int>, std::array<int, 4>>,
418418
"!ConversionCompilesFor<span<int>, std::array<int, 4>>");
419419
#endif
@@ -529,8 +529,8 @@ TEST(span_test, from_container_constructor)
529529
EXPECT_TRUE(cs.data() == cstr.data());
530530
}
531531

532-
#if !defined(_MSC_VER) || (_MSC_VER > 1943) || (__cplusplus >= 201703L)
533-
// Fails on "Visual Studio 16 2019/Visual Studio 17 2022, windows-2019/2022, Debug/Release, 14".
532+
#if !defined(_MSC_VER) || (__cplusplus >= 201703L)
533+
// Fails on MSVC. TODO: report a feedback bug.
534534
static_assert(!ConversionCompilesFor<span<int>, std::vector<int>>,
535535
"!ConversionCompilesFor<span<int>, std::vector<int>>");
536536
#endif // !defined(_MSC_VER) || (_MSC_VER > 1942) || (__cplusplus >= 201703L)

0 commit comments

Comments
 (0)