From a160038e1abf1a460cfe36867b010bf0efcb9a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Hellstr=C3=B6m?= Date: Sun, 13 Sep 2020 16:20:22 +0200 Subject: [PATCH] ci: re-enable autobahn tests (without autofree) (#6360) --- .github/workflows/ci.yml | 66 +++++++++---------- .../tests/autobahn/ws_test/Dockerfile | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f071f060c..5d9646c52a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -480,39 +480,39 @@ jobs: # TODO: ACTIVATE THIS AFTER MERGE - # websocket_autobahn: - # name: Autobahn integrations tests - # runs-on: ubuntu-latest - # steps: - # - name: Checkout - # uses: actions/checkout@v2 + websocket_autobahn: + name: Autobahn integrations tests + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 - # - name: Run autobahn services - # run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d - # - name: Build client test - # run: docker exec autobahn_client "v" "/src/tests/autobahn/autobahn_client.v" - # - name: Run client test - # run: docker exec autobahn_client "/src/tests/autobahn/autobahn_client" - # - name: Run server test - # run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json" - # - name: Copy reports - # run: docker cp autobahn_server:/reports ${{github.workspace}}/reports - # - name: Test success - # run: docker exec autobahn_server "python" "/check_results.py" + - name: Run autobahn services + run: docker-compose -f ${{github.workspace}}/vlib/x/websocket/tests/autobahn/docker-compose.yml up -d + - name: Build client test + run: docker exec autobahn_client "v" "/src/tests/autobahn/autobahn_client.v" + - name: Run client test + run: docker exec autobahn_client "/src/tests/autobahn/autobahn_client" + - name: Run server test + run: docker exec autobahn_server "wstest" "-m" "fuzzingclient" "-s" "/config/fuzzingclient.json" + - name: Copy reports + run: docker cp autobahn_server:/reports ${{github.workspace}}/reports + - name: Test success + run: docker exec autobahn_server "python" "/check_results.py" - # - name: Publish all reports - # uses: actions/upload-artifact@v2 - # with: - # name: full report - # path: ${{github.workspace}}/reports - # - name: Publish report client - # uses: actions/upload-artifact@v2 - # with: - # name: client - # path: ${{github.workspace}}/reports/clients/index.html - # - name: Publish report server - # uses: actions/upload-artifact@v2 - # with: - # name: server - # path: ${{github.workspace}}/reports/servers/index.html + - name: Publish all reports + uses: actions/upload-artifact@v2 + with: + name: full report + path: ${{github.workspace}}/reports + - name: Publish report client + uses: actions/upload-artifact@v2 + with: + name: client + path: ${{github.workspace}}/reports/clients/index.html + - name: Publish report server + uses: actions/upload-artifact@v2 + with: + name: server + path: ${{github.workspace}}/reports/servers/index.html diff --git a/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile b/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile index 9c22467dcd..62ace99af3 100644 --- a/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile +++ b/vlib/x/websocket/tests/autobahn/ws_test/Dockerfile @@ -6,6 +6,6 @@ FROM thevlang/vlang:buster-dev COPY ./ /src/ # COPY tests/autobahn/ws_test/run.sh /run.sh # RUN chmod +x /run.sh -RUN v -autofree /src/tests/autobahn/autobahn_server.v +RUN v /src/tests/autobahn/autobahn_server.v RUN chmod +x /src/tests/autobahn/autobahn_server ENTRYPOINT [ "/src/tests/autobahn/autobahn_server" ]