Skip to content

Commit 5961168

Browse files
committed
Update ci for windows and linux for deprecated and new OS
1 parent 4a929ba commit 5961168

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/linux-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-20.04, ubuntu-22.04]
21+
os: [ubuntu-22.04, ubuntu-24.04]
2222
build_static: [true, false]
2323
flags: [ADD_CXXFLAGS=-fvisibility=hidden]
24-
download_requirements: [sudo apt install -y -qq gfortran liblapack-dev libmetis-dev libnauty2-dev]
24+
download_requirements: [sudo apt install -y -qq gfortran liblapack-dev libmetis-dev libnauty-dev]
2525
include:
2626
- os: macos-13
2727
build_static: false

.github/workflows/windows-ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include: [
23-
{ os: windows-2019, arch: x86_64, msystem: mingw64, debug: true, suffix: "-dbg" },
24-
{ os: windows-2019, arch: x86_64, msystem: mingw64, debug: false, suffix: "" },
25-
{ os: windows-2019, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
23+
{ os: windows-2022, arch: x86_64, msystem: mingw64, debug: true, suffix: "-dbg" },
24+
{ os: windows-2025, arch: x86_64, msystem: mingw64, debug: true, suffix: "-dbg" },
25+
{ os: windows-2025, arch: x86_64, msystem: mingw64, debug: false, suffix: "" },
2626
{ os: windows-2022, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
27+
{ os: windows-2025, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
2728
]
2829
steps:
2930
- name: Checkout source
@@ -77,12 +78,12 @@ jobs:
7778
- name: Generate package name for msvc
7879
run: |
7980
msvc_version=${VisualStudioVersion%.*}
80-
echo "package_suffix=w64-msvc${msvc_version}${{ matrix.suffix }}" >> $GITHUB_ENV
81+
echo "package_suffix=${{ matrix.os}}-msvc${msvc_version}${{ matrix.suffix }}" >> $GITHUB_ENV
8182
shell: msys2 {0}
8283
if: ${{ matrix.arch == 'msvc' }}
8384
- name: Generate package name
8485
run: |
85-
echo "package_suffix=${{ matrix.arch }}-w64-${{ matrix.msystem }}${{ matrix.suffix }}" >> $GITHUB_ENV
86+
echo "package_suffix=${{ matrix.arch }}-${{ matrix.os}}-${{ matrix.msystem }}${{ matrix.suffix }}" >> $GITHUB_ENV
8687
shell: msys2 {0}
8788
if: ${{ matrix.arch != 'msvc' }}
8889
- name: Upload artifact

.github/workflows/windows-msvs-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
# Only os: windows-2022 has Visual Studio 2022 (v17) installed with toolset v143, which is required.
2424
# configuration: "Release" or "Debug", platform: "x86" or "x64". See solution Configuration Manager.
2525
{ os: windows-2022, configuration: "Release", platform: "x64" },
26+
{ os: windows-2025, configuration: "Release", platform: "x64" }
2627
]
2728
steps:
2829
- name: Set up environment variables

0 commit comments

Comments
 (0)