Merge linux.yml and windows.yml into ci.yml

aresrpg · Jan 23, 2021 · b7b0cc0 · b7b0cc0
1 parent 6d072c3
commit b7b0cc0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/windows.yml → .github/workflows/ci.yml b/.github/workflows/windows.yml → .github/workflows/ci.yml
@@ -1,9 +1,26 @@
-name: Windows
+name: CI
 
 on: [push]
 
 jobs:
-  build:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - run: sudo add-apt-repository ppa:wireshark-dev/stable
+      - run: sudo apt-get install make gcc pkg-config wireshark-dev
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 14
+      - run: make packet-minecraft.so
+      - uses: actions/upload-artifact@v2
+        with:
+          name: linux
+          path: packet-minecraft.so
+
+  build-windows:
     runs-on: windows-latest
     env:
       PLATFORM: x64
@@ -45,5 +62,5 @@ jobs:
         working-directory: dissector
       - uses: actions/upload-artifact@v2
         with:
+          name: windows
           path: dissector/packet-minecraft.dll
-
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml