Skip to content

Commit 0638a06

Browse files
committed
simplify github workflows
1 parent 9daa040 commit 0638a06

File tree

6 files changed

+9
-50
lines changed

6 files changed

+9
-50
lines changed

.github/workflows/aarch64.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/workflows/macos_install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222

2323
jobs:
2424
macos-build:
25-
runs-on: macos-latest
25+
runs-on: macos-15
2626
strategy:
2727
matrix:
2828
include:

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ concurrency:
2222

2323
jobs:
2424
ubuntu-build:
25-
runs-on: ubuntu-22.04
2625
strategy:
2726
matrix:
2827
shared: [ON, OFF]
2928
cxx: [g++-12, clang++-14]
29+
runs-on: [ubuntu-22.04, ubuntu-22.04-arm]
30+
runs-on: ${{matrix.runs-on}}
3031
steps:
3132
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3233
- name: Setup Ninja

.github/workflows/ubuntu_install.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@ jobs:
2525
runs-on: ubuntu-24.04
2626
strategy:
2727
matrix:
28-
include:
29-
shared: [ON, OFF]
30-
cxx: [g++-12, clang++]
28+
shared: [ON, OFF]
29+
cxx: [g++-12, clang++]
3130
steps:
3231
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3332
- name: Setup Ninja
3433
run: sudo apt-get install ninja-build
3534
- name: Prepare
3635
run: cmake -D ADA_TESTING=ON -G Ninja -DBUILD_SHARED_LIBS=${{matrix.shared}} -DCMAKE_INSTALL_PREFIX:PATH=destination -B build
36+
env:
37+
CXX: ${{matrix.cxx}}
3738
- name: Build
3839
run: cmake --build build -j=4
3940
- name: Install

.github/workflows/visual_studio.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
jobs:
2424
ci:
2525
name: windows-vs17
26-
runs-on: windows-latest
26+
runs-on: windows-2025
2727
strategy:
2828
fail-fast: false
2929
matrix:

.github/workflows/visual_studio_clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
jobs:
2424
ci:
2525
name: windows-vs17
26-
runs-on: windows-latest
26+
runs-on: windows-2025
2727
strategy:
2828
fail-fast: false
2929
matrix:

0 commit comments

Comments
 (0)