Skip to content

Commit 275bab2

Browse files
committed
Update workflows
1 parent 7cc89ae commit 275bab2

3 files changed

Lines changed: 9 additions & 23 deletions

File tree

.github/workflows/arm_gcc.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,18 @@ jobs:
3939
flags: '-std=c++26 -Werror -Wno-psabi'
4040

4141
runs-on: ubuntu-24.04-arm
42+
container: ubuntu:24.04
4243

4344
steps:
45+
- name: Install tools
46+
run: |
47+
apt-get update
48+
apt-get install -y cmake
49+
apt-get install -y ninja-build
4450
- name: Checkout
4551
uses: actions/checkout@v4
46-
- name: Install Ninja
47-
run: sudo apt-get install ninja-build
4852
- name: Install GCC
49-
run: sudo apt install g++-${{ matrix.gcc_ver }}
53+
run: apt-get install -y g++-${{ matrix.gcc_ver }}
5054
- name: Build
5155
env:
5256
CXX: g++-${{ matrix.gcc_ver }}

.github/workflows/arm_msvc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
uses: ilammy/msvc-dev-cmd@v1
2828
with:
2929
arch: arm64
30+
toolset: '14.4'
3031
- name: Build
3132
env:
3233
CXXFLAGS: ${{ matrix.flags }}

.github/workflows/win_clang.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,64 +8,45 @@ jobs:
88
matrix:
99
include:
1010

11-
- build_type: 'Release'
12-
test_extra: 'Off'
13-
flags: '-std=c++26'
14-
win_ver: '11-arm'
15-
16-
- build_type: 'Debug'
17-
test_extra: 'Off'
18-
flags: '-std=c++26'
19-
win_ver: '11-arm'
20-
2111
# x64
2212
- build_type: 'Release'
2313
test_extra: 'Off'
2414
flags: '-std=c++23 -Werror'
25-
win_ver: '2025'
2615

2716
- build_type: 'Release'
2817
test_extra: 'Off'
2918
flags: '-std=c++26 -Werror'
30-
win_ver: '2025'
3119

3220
- build_type: 'Debug'
3321
test_extra: 'Off'
3422
flags: '-std=c++26 -Werror'
35-
win_ver: '2025'
3623

3724
# x86
3825
- build_type: 'Release'
3926
test_extra: 'Off'
4027
flags: '-m32 -std=c++23 -Werror'
41-
win_ver: '2025'
4228

4329
- build_type: 'Release'
4430
test_extra: 'On'
4531
flags: '-m32 -std=c++23 -Werror'
46-
win_ver: '2025'
4732

4833
- build_type: 'Release'
4934
test_extra: 'Off'
5035
flags: '-m32 -std=c++26 -Werror'
51-
win_ver: '2025'
5236

5337
- build_type: 'Release'
5438
test_extra: 'On'
5539
flags: '-m32 -std=c++26 -Werror'
56-
win_ver: '2025'
5740

5841
- build_type: 'Debug'
5942
test_extra: 'Off'
6043
flags: '-m32 -std=c++26 -Werror'
61-
win_ver: '2025'
6244

6345
- build_type: 'Debug'
6446
test_extra: 'On'
6547
flags: '-m32 -std=c++26 -Werror'
66-
win_ver: '2025'
6748

68-
runs-on: windows-${{ matrix.win_ver }}
49+
runs-on: windows-latest
6950

7051
steps:
7152
- name: Checkout

0 commit comments

Comments
 (0)