From b7b0cc0cb97aec2bdcf4b9e3212eb93d2c55f522 Mon Sep 17 00:00:00 2001
From: Duarte David <deltaduartedavid@gmail.com>
Date: Sat, 23 Jan 2021 22:59:41 +0100
Subject: [PATCH] Merge linux.yml and windows.yml into ci.yml

---
 .github/workflows/{windows.yml => ci.yml} | 23 ++++++++++++++++++++---
 .github/workflows/linux.yml               | 21 ---------------------
 2 files changed, 20 insertions(+), 24 deletions(-)
 rename .github/workflows/{windows.yml => ci.yml} (74%)
 delete mode 100644 .github/workflows/linux.yml

diff --git a/.github/workflows/windows.yml b/.github/workflows/ci.yml
similarity index 74%
rename from .github/workflows/windows.yml
rename to .github/workflows/ci.yml
index 9ed0e5d..23974b2 100644
--- a/.github/workflows/windows.yml
+++ b/.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
deleted file mode 100644
index ae73ffb..0000000
--- a/.github/workflows/linux.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Linux
-
-on: [push]
-
-jobs:
-  build:
-    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:
-          path: packet-minecraft.so
-