Skip to content

update ci with github runner-images #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liudongmiao wants to merge 6 commits into
base: master
Choose a base branch
from
Open

update ci with github runner-images #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eed9e06
add macos-15 to ci
liudongmiao Sep 29, 2024
bbeb1e7
update ci to try windows-2025
liudongmiao Jul 22, 2025
db568da
Create windows-2025.json
liudongmiao Jul 22, 2025
618dd72
Update run-test-udp.sh
liudongmiao Jul 22, 2025
e007450
remove windows-2019
liudongmiao Jul 22, 2025
c50a7fe
simplify windows vcpkg
liudongmiao Jul 22, 2025
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
23 changes: 0 additions & 23 deletions .github/vcpkg/windows-2019.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/vcpkg/windows-2022.json → .github/vcpkg/windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc",
"builtin-baseline": "031ad89ce6c575df35a8e58707ad2c898446c63e",
"dependencies": [
{
"default-features": false,
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
# https://github.com/actions/runner-images
os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, macos-14, macos-13, macos-12, windows-2022, windows-2019]
os: [ubuntu-24.04, ubuntu-22.04, macos-15, macos-14, macos-13, windows-2025, windows-2022]

steps:
- uses: actions/checkout@v4
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Install libevent and openssl on windows
if: ${{ startsWith(matrix.os, 'windows') }}
run: |
copy .github\vcpkg\${{matrix.os}}.json vcpkg.json
copy .github\vcpkg\windows.json vcpkg.json
vcpkg install --triplet x64-windows-static

- name: Configure CMake on ubuntu and macos
Expand Down Expand Up @@ -85,6 +85,6 @@ jobs:
if: ${{ startsWith(matrix.os, 'windows') }}
uses: actions/upload-artifact@v4
with:
name: wss-proxy-client-openssl-${{ matrix.os == 'windows-2019' && '3.0' || '3.3' }}
name: wss-proxy-client-${{matrix.os}}
path: |
build/${{env.BUILD_TYPE}}/wss-proxy-client.exe
2 changes: 1 addition & 1 deletion testcase/run-test-udp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ if which docker >/dev/null 2>&1 && docker version 2>/dev/null | grep -i linux/am
fi
fi
if [ ! -f ../testcase/nginx/nginx-1.26.1-2.el7.wss.x86_64.rpm ]; then
if ! curl -q -s https://cdn.jianyu.io/rpm/nginx-1.26.1-2.el7.wss.x86_64.rpm -o ../testcase/nginx/nginx-1.26.1-2.el7.wss.x86_64.rpm; then
if ! curl -q -s https://pac.jianyu.io/rpm/nginx-1.26.1-2.el7.wss.x86_64.rpm -o ../testcase/nginx/nginx-1.26.1-2.el7.wss.x86_64.rpm; then
echo "cannot download nginx wss"
exit 0
fi
Expand Down