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-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 1528c0a..d7b6b94 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, macos-15, macos-14, macos-13, windows-2025, windows-2022] steps: - uses: actions/checkout@v4 @@ -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 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