Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
CXX: g++-12
PackageDeps: g++-12
os: ubuntu-22.04
- CC: vs2019
CXX: vs2019
os: windows-2019
- CC: vs2022
CXX: vs2022
os: windows-2022
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} ${{ matrix.CXX }}
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
CXX: g++-10
PackageDeps: g++-10
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
os: ubuntu-20.04
os: ubuntu-24.04
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} ${{ matrix.CXX }} ${{ matrix.feature }}
env:
Expand All @@ -43,7 +43,7 @@ jobs:
path: ${{ env.DOC_ROOT }}
- name: Add Repo
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ ${{ matrix.Repo }} main"
if: matrix.Repo != ''
- name: Add packages
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,6 @@ jobs:
fail-fast: false
matrix:
include:
- name: VS2019Debug64
vmimage: windows-2019
mpctype: vs2019
BuildPlatform: x64
BuildConfiguration: Debug
vcpkgarch: x64-windows
vcpkglibdir: debug/lib
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
- name: VS2019Release32
vmimage: windows-2019
mpctype: vs2019
BuildPlatform: Win32
BuildConfiguration: Release
vcpkgarch: x86-windows
vcpkglibdir: lib
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
- name: VS2022Debug64
vmimage: windows-2022
mpctype: vs2022
Expand Down