Merge 5653d43ff0 into a8d60b0b05

.github/workflows/test-macos.yml

@@ -8,7 +8,6 @@ on:
 
 env:
   TWITCH_PUBSUB_SERVER_TAG: v1.0.7
-  HTTPBOX_TAG: v0.2.1
   QT_QPA_PLATFORM: minimal
   HOMEBREW_NO_AUTO_UPDATE: 1
   HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
@@ -59,13 +58,6 @@ jobs:
         run: |
           brew install boost openssl rapidjson p7zip create-dmg cmake
 
-      - name: Install httpbox
-        run: |
-          curl -L -o httpbox.tar.xz "https://github.com/Chatterino/httpbox/releases/download/${{ env.HTTPBOX_TAG }}/httpbox-x86_64-apple-darwin.tar.xz"
-          tar -xJf httpbox.tar.xz
-          mv ./httpbox-x86_64-apple-darwin/httpbox /usr/local/bin
-        working-directory: /tmp
-
       - name: Build
         run: |
           mkdir build-test
@@ -91,6 +83,10 @@ jobs:
           curl -L -o server.key "https://github.com/Chatterino/twitch-pubsub-server-test/raw/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/cmd/server/server.key"
           cd ..
 
+      - name: Cargo Install httpbox
+        run: |
+          cargo install --git https://github.com/kevinastone/httpbox --rev 89b971f
+
       - name: Test
         timeout-minutes: 30
         run: |

.github/workflows/test-windows.yml

@@ -8,7 +8,6 @@ on:
 
 env:
   TWITCH_PUBSUB_SERVER_TAG: v1.0.7
-  HTTPBOX_TAG: v0.2.1
   QT_QPA_PLATFORM: minimal
   # Last known good conan version
   # 2.0.3 has a bug on Windows (conan-io/conan#13606)
@@ -112,13 +111,6 @@ jobs:
           mkdir -Force build-test/bin
           cp "$((ls $Env:VCToolsRedistDir/onecore/x64 -Filter '*.CRT')[0].FullName)/*" build-test/bin
 
-      - name: Install httpbox
-        run: |
-          mkdir httpbox
-          Invoke-WebRequest -Uri "https://github.com/Chatterino/httpbox/releases/download/${{ env.HTTPBOX_TAG }}/httpbox-x86_64-pc-windows-msvc.zip" -outfile "httpbox.zip"
-          Expand-Archive httpbox.zip -DestinationPath httpbox
-          rm httpbox.zip
-
       - name: Build
         run: |
           cmake `
@@ -147,10 +139,14 @@ jobs:
           Invoke-WebRequest -Uri "https://github.com/Chatterino/twitch-pubsub-server-test/raw/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/cmd/server/server.key" -outfile "server.key"
           cd ..
 
+      - name: Cargo Install httpbox
+        run: |
+          cargo install --git https://github.com/kevinastone/httpbox --rev 89b971f
+
       - name: Test
         timeout-minutes: 30
         run: |
-          ..\httpbox\httpbox.exe --port 9051 &
+          httpbox --port 9051 &
           cd ..\pubsub-server-test
           .\server.exe 127.0.0.1:9050 &
           cd ..\build-test

tests/README.md

@@ -1,7 +1,10 @@
-# Pre-requisites to running tests
+To run all tests you will need to run the `kennethreitz/httpbin` and `ghcr.io/chatterino/twitch-pubsub-server-test:latest` docker images.
 
-- Download & run [httpbox](https://github.com/Chatterino/httpbox/releases/latest)  
+For example:
-  `httpbox --port 9051`
 
-- Download & run [twitch-pubsub-server-test](https://github.com/Chatterino/twitch-pubsub-server-test/releases/latest)  
+```bash
-  `twitch-pubsub-server-test`
+docker run --network=host --detach ghcr.io/chatterino/twitch-pubsub-server-test:latest
+docker run -p 9051:80 --detach kennethreitz/httpbin
+```
+
+If you're unable to use docker, you can use [httpbox](https://github.com/kevinastone/httpbox) (`httpbox --port 9051`) and [Chatterino/twitch-pubsub-server-test](https://github.com/Chatterino/twitch-pubsub-server-test/releases/latest) manually.