feat: Finalized CI pipeline

kappa · Mar 12, 2021 · 28caa1e · 28caa1e
1 parent 86b74a6
commit 28caa1e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,10 @@
 name: Test
 
-on: [push]
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -26,7 +30,7 @@ jobs:
 
       - name: Build docker container
         run: |
-          cd test && docker build -t test_suite:latest .
+          cd ci && docker build -t test_suite:latest .
           docker run -d -p 4200:4200 -p 4201:4201 test_suite:latest
 
       - name: Run testsuite

diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,5 @@
 Cargo.lock
 .vscode
 .idea
-test/node_modules
-test/package-lock.json
+ci/node_modules
+ci/package-lock.json
diff --git a/test/.dockerignore → ci/.dockerignore b/test/.dockerignore → ci/.dockerignore
diff --git a/test/Dockerfile → ci/Dockerfile b/test/Dockerfile → ci/Dockerfile
diff --git a/test/engine-io.js → ci/engine-io.js b/test/engine-io.js → ci/engine-io.js
diff --git a/test/package.json → ci/package.json b/test/package.json → ci/package.json
diff --git a/test/socket-io.js → ci/socket-io.js b/test/socket-io.js → ci/socket-io.js
diff --git a/test/start_test_server.sh → ci/start_test_server.sh b/test/start_test_server.sh → ci/start_test_server.sh