Skip to content

Commit bac7d41

Browse files
committed
fixing CI
1 parent c5f8ba4 commit bac7d41

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -329,48 +329,48 @@ jobs:
329329
- name: Configure local host
330330
run: |
331331
python3 -m pip install h2
332-
cd crt/aws-c-http/tests/py_localhost/
333-
python3 server.py &
334-
python3 non_tls_server.py &
332+
cd crt/aws-c-http/tests/mock_server/
333+
python3 h2tls_mock_server.py &
334+
python3 h2non_tls_server.py &
335335
- name: Build and test
336336
run: |
337337
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
338338
python builder.pyz localhost-canary -p ${{ env.PACKAGE_NAME }} --spec=downstream
339339
340340
localhost-canary-mac:
341-
runs-on: macos-11 # latest
341+
runs-on: macos-15 # latest
342342
steps:
343343
- name: Checkout
344-
uses: actions/checkout@v3
344+
uses: actions/checkout@v4
345345
with:
346346
submodules: true
347347
- name: Configure local host
348348
run: |
349349
python3 -m pip install h2
350-
cd crt/aws-c-http/tests/py_localhost/
351-
python3 server.py &
352-
python3 non_tls_server.py &
350+
cd crt/aws-c-http/tests/mock_server/
351+
python3 h2tls_mock_server.py &
352+
python3 h2non_tls_server.py &
353353
- name: Build and test
354354
run: |
355355
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
356356
chmod a+x builder
357357
./builder localhost-canary -p ${{ env.PACKAGE_NAME }} --spec=downstream
358358
359359
localhost-canary-win:
360-
runs-on: windows-2022 # latest
360+
runs-on: windows-2025 # latest
361361
steps:
362362
- name: Checkout
363-
uses: actions/checkout@v3
363+
uses: actions/checkout@v4
364364
with:
365365
submodules: true
366366
- name: Configure local host
367367
run: |
368368
python -m pip install h2
369369
- name: Build and test
370370
run: |
371-
cd crt/aws-c-http/tests/py_localhost/
372-
Start-Process -NoNewWindow python .\server.py
373-
Start-Process -NoNewWindow python .\non_tls_server.py
371+
cd crt/aws-c-http/tests/mock_server/
372+
Start-Process -NoNewWindow python .\h2tls_mock_server.py
373+
Start-Process -NoNewWindow python .\h2non_tls_server.py
374374
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
375375
python builder.pyz localhost-canary -p ${{ env.PACKAGE_NAME }} downstream
376376

samples/HttpClientCanary/src/main/java/com/canary/Http2StreamManagerCanary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public static void main(String[] args) throws Exception {
223223

224224
Http2StreamManagerCanary canary = new Http2StreamManagerCanary();
225225

226-
canary.uri = new URI(System.getProperty("aws.crt.http.canary.uri", "https://localhost:8443/echo"));
226+
canary.uri = new URI(System.getProperty("aws.crt.http.canary.uri", "https://localhost:3443/echo"));
227227
canary.maxConnections = Integer.parseInt(System.getProperty("aws.crt.http.canary.maxConnections", "8"));
228228
canary.maxStreams = Integer.parseInt(System.getProperty("aws.crt.http.canary.maxStreams", "20"));
229229
canary.nettyResultPath = System.getProperty("aws.crt.http.canary.nettyResultPath", "netty_result.txt");

samples/HttpClientCanary/src/main/java/com/canary/SDKNettyClientCanary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private void runCanary(int warmupLoops, int loops, long timerSecs) throws Except
157157
public static void main(String[] args) throws Exception {
158158
SDKNettyClientCanary canary = new SDKNettyClientCanary();
159159

160-
canary.uri = new URI(System.getProperty("aws.crt.http.canary.uri", "https://localhost:8443/echo"));
160+
canary.uri = new URI(System.getProperty("aws.crt.http.canary.uri", "https://localhost:3443/echo"));
161161
canary.maxConnections = Integer.parseInt(System.getProperty("aws.crt.http.canary.maxConnections", "8"));
162162
canary.maxStreams = Integer.parseInt(System.getProperty("aws.crt.http.canary.maxStreams", "20"));
163163
canary.nettyResultPath = System.getProperty("aws.crt.http.canary.nettyResultPath", "netty_result.txt");

0 commit comments

Comments
 (0)