Skip to content

Commit 0c6208a

Browse files
Remove CI macos-13, added macos-26-arm64
1 parent ef9f282 commit 0c6208a

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ jobs:
146146
cd tests
147147
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }} 32
148148
149-
tests-macos13-gpp:
149+
tests-macos14-gpp:
150150
strategy:
151151
matrix:
152-
os: [macos-13]
152+
os: [macos-14]
153153
compiler: [g++]
154-
version: [12, 13, 14]
154+
version: [13, 14, 15]
155155
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
156156
runs-on: ${{ matrix.os }}
157157
steps:
@@ -161,10 +161,10 @@ jobs:
161161
cd tests
162162
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
163163
164-
tests-macos13-clang:
164+
tests-macos14-clang:
165165
strategy:
166166
matrix:
167-
os: [macos-13]
167+
os: [macos-14]
168168
compiler: [clang++]
169169
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
170170
runs-on: ${{ matrix.os }}
@@ -175,12 +175,12 @@ jobs:
175175
cd tests
176176
bash ./run.sh ${{ matrix.compiler }}
177177
178-
tests-macos14-gpp:
178+
tests-macos26arm64-gpp:
179179
strategy:
180180
matrix:
181-
os: [macos-14]
181+
os: [macos-26-arm64]
182182
compiler: [g++]
183-
version: [13, 14]
183+
version: [13, 14, 15]
184184
name: Use ${{ matrix.compiler }}-${{ matrix.version }} on ${{ matrix.os }}
185185
runs-on: ${{ matrix.os }}
186186
steps:
@@ -190,10 +190,10 @@ jobs:
190190
cd tests
191191
bash ./run.sh ${{ matrix.compiler }} v${{ matrix.version }}
192192
193-
tests-macos14-clang:
193+
tests-macos26arm64-clang:
194194
strategy:
195195
matrix:
196-
os: [macos-14]
196+
os: [macos-26-arm64]
197197
compiler: [clang++]
198198
name: Use ${{ matrix.compiler }} on ${{ matrix.os }}
199199
runs-on: ${{ matrix.os }}

tests/docker/clang-11/run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ SET IMAGE_NAME=test-testlib-clang-11
44
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
55

66
"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
7-
docker run -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%
7+
docker run --rm -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%

tests/docker/clang-3.5/run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ SET IMAGE_NAME=test-testlib-clang-3.5
44
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
55

66
"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
7-
docker run -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%
7+
docker run --rm -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%

tests/docker/clang-7/run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ SET IMAGE_NAME=test-testlib-clang-7
44
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
55

66
"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
7-
docker run -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%
7+
docker run --rm -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%

tests/docker/clang-latest/run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ SET IMAGE_NAME=test-testlib-clang-latest
44
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
55

66
"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
7-
docker run -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%
7+
docker run --rm -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%

tests/docker/gcc-7/run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ SET IMAGE_NAME=test-testlib-gcc-7
44
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
55

66
"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
7-
docker run -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%
7+
docker run --rm -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%

tests/docker/gcc-latest/run.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ SET IMAGE_NAME=test-testlib-gcc-latest
44
for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i
55

66
"C:\Program Files\Docker\Docker"\DockerCli.exe -SwitchLinuxEngine
7-
docker run -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%
7+
docker run --rm -it %IMAGE_NAME% /bin/bash /startup.sh %CURRENT_BRANCH%

0 commit comments

Comments
 (0)