From eed9e06724a3f2afdd206f5f3a7d772fde8996a6 Mon Sep 17 00:00:00 2001 From: Liu Dongmiao Date: Sun, 29 Sep 2024 15:21:19 +0800 Subject: [PATCH 1/6] add macos-15 to ci --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1528c0a..c5adac4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -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, ubuntu-20.04, macos-15, macos-14, macos-13, macos-12, windows-2022, windows-2019] steps: - uses: actions/checkout@v4 From bbeb1e769241b49b7ed609d0f7d2085ecf9ed85b Mon Sep 17 00:00:00 2001 From: Liu Dongmiao Date: Tue, 22 Jul 2025 16:17:24 +0800 Subject: [PATCH 2/6] update ci to try windows-2025 --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index c5adac4..e9d6cfb 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: # https://github.com/actions/runner-images - os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, macos-15, 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, windows-2019] steps: - uses: actions/checkout@v4 From db568da5e805058a015c62f047c9eeac080fad2d Mon Sep 17 00:00:00 2001 From: Liu Dongmiao Date: Tue, 22 Jul 2025 16:22:34 +0800 Subject: [PATCH 3/6] Create windows-2025.json --- .github/vcpkg/windows-2025.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/vcpkg/windows-2025.json diff --git a/.github/vcpkg/windows-2025.json b/.github/vcpkg/windows-2025.json new file mode 100644 index 0000000..0cce5af --- /dev/null +++ b/.github/vcpkg/windows-2025.json @@ -0,0 +1,19 @@ +{ + "builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc", + "dependencies": [ + { + "default-features": false, + "name": "libevent" + }, + { + "default-features": false, + "name": "openssl" + } + ], + "overrides": [ + { + "name": "libevent", + "version": "2.1.12#7" + } + ] +} From 618dd7203b79f7a547322b50b65099dec5519de4 Mon Sep 17 00:00:00 2001 From: Liu Dongmiao Date: Tue, 22 Jul 2025 16:30:14 +0800 Subject: [PATCH 4/6] Update run-test-udp.sh --- testcase/run-test-udp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcase/run-test-udp.sh b/testcase/run-test-udp.sh index d049c08..b0ecc9f 100755 --- a/testcase/run-test-udp.sh +++ b/testcase/run-test-udp.sh @@ -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 From e0074501d82d0b27a447becbfe8f74b0609bcc9a Mon Sep 17 00:00:00 2001 From: Liu Dongmiao Date: Tue, 22 Jul 2025 16:31:55 +0800 Subject: [PATCH 5/6] remove windows-2019 --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e9d6cfb..6e0b82b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: # https://github.com/actions/runner-images - os: [ubuntu-24.04, ubuntu-22.04, macos-15, macos-14, macos-13, windows-2025, 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 From c50a7fed94c4891df225028d7b125e6165a01e3b Mon Sep 17 00:00:00 2001 From: Liu Dongmiao Date: Tue, 22 Jul 2025 16:46:26 +0800 Subject: [PATCH 6/6] simplify windows vcpkg --- .github/vcpkg/windows-2019.json | 23 ------------------- .github/vcpkg/windows-2025.json | 19 --------------- .../vcpkg/{windows-2022.json => windows.json} | 2 +- .github/workflows/master.yml | 4 ++-- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 .github/vcpkg/windows-2019.json delete mode 100644 .github/vcpkg/windows-2025.json rename .github/vcpkg/{windows-2022.json => windows.json} (80%) diff --git a/.github/vcpkg/windows-2019.json b/.github/vcpkg/windows-2019.json deleted file mode 100644 index 9263f14..0000000 --- a/.github/vcpkg/windows-2019.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc", - "dependencies": [ - { - "default-features": false, - "name": "libevent" - }, - { - "default-features": false, - "name": "openssl" - } - ], - "overrides": [ - { - "name": "libevent", - "version": "2.1.12#7" - }, - { - "name": "openssl", - "version": "3.0.8#2" - } - ] -} \ No newline at end of file diff --git a/.github/vcpkg/windows-2025.json b/.github/vcpkg/windows-2025.json deleted file mode 100644 index 0cce5af..0000000 --- a/.github/vcpkg/windows-2025.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc", - "dependencies": [ - { - "default-features": false, - "name": "libevent" - }, - { - "default-features": false, - "name": "openssl" - } - ], - "overrides": [ - { - "name": "libevent", - "version": "2.1.12#7" - } - ] -} diff --git a/.github/vcpkg/windows-2022.json b/.github/vcpkg/windows.json similarity index 80% rename from .github/vcpkg/windows-2022.json rename to .github/vcpkg/windows.json index d943d5b..2d45fe2 100644 --- a/.github/vcpkg/windows-2022.json +++ b/.github/vcpkg/windows.json @@ -1,5 +1,5 @@ { - "builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc", + "builtin-baseline": "031ad89ce6c575df35a8e58707ad2c898446c63e", "dependencies": [ { "default-features": false, diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6e0b82b..d7b6b94 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -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 @@ -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