Skip to content

Commit 4abacbc

Browse files
authored
Merge pull request DOCGroup#229 from mitza-oci/master
Update GitHub Actions CI
2 parents a7e38f3 + f62a8db commit 4abacbc

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

.github/workflows/cmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
CXX: g++-12
2525
PackageDeps: g++-12
2626
os: ubuntu-22.04
27-
- CC: vs2019
28-
CXX: vs2019
29-
os: windows-2019
27+
- CC: vs2022
28+
CXX: vs2022
29+
os: windows-2022
3030
runs-on: ${{ matrix.os }}
3131
name: ${{ matrix.os }} ${{ matrix.CXX }}
3232
env:

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
CXX: g++-10
2424
PackageDeps: g++-10
2525
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
26-
os: ubuntu-20.04
26+
os: ubuntu-24.04
2727
runs-on: ${{ matrix.os }}
2828
name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
2929
env:
@@ -43,7 +43,7 @@ jobs:
4343
path: ${{ env.DOC_ROOT }}
4444
- name: Add Repo
4545
run: |
46-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
46+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
4747
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
4848
if: matrix.Repo != ''
4949
- name: Add packages

.github/workflows/windows.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,6 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- name: VS2019Debug64
24-
vmimage: windows-2019
25-
mpctype: vs2019
26-
BuildPlatform: x64
27-
BuildConfiguration: Debug
28-
vcpkgarch: x64-windows
29-
vcpkglibdir: debug/lib
30-
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
31-
- name: VS2019Release32
32-
vmimage: windows-2019
33-
mpctype: vs2019
34-
BuildPlatform: Win32
35-
BuildConfiguration: Release
36-
vcpkgarch: x86-windows
37-
vcpkglibdir: lib
38-
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
3923
- name: VS2022Debug64
4024
vmimage: windows-2022
4125
mpctype: vs2022

0 commit comments

Comments
 (0)