From 2890129a0eaa41c36171ea5d86e433dc94cf386d Mon Sep 17 00:00:00 2001
From: Simon Jentzsch <simon@slock.it>
Date: Fri, 15 Nov 2019 09:38:42 +0100
Subject: [PATCH 1/2] fix github actions

---
 .github/workflows/ccpp.yml   | 55 ++++++++++++++++--------------------
 .github/workflows/docker.yml | 12 ++++++++
 .github/workflows/wasm.yml   | 28 ++++++++++++++++++
 3 files changed, 64 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/docker.yml
 create mode 100644 .github/workflows/wasm.yml

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 348f2eb3d..ced9162df 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1,43 +1,36 @@
-name: C/C++ CI
+name: Build and Test C
 
 on: [push]
 
 jobs:
-  test_macos:
-
+  macos:
     runs-on: macOS-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - name: cmake
-      run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DCMAKE_BUILD_TYPE=Debug ..
-    - name: make
-      run: cd build; make
-    - name: test
-      run: cd build; make test
 
-  test_ubuntu:
+    steps:
+      - uses: actions/checkout@v1
+      - name: cmake
+        run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DCMAKE_BUILD_TYPE=Debug ..
+      - name: make
+        run: cd build; make
+      - name: test
+        run: cd build; make test
 
+  ubuntu:
     runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - name: cmake
-      run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
-    - name: make
-      run: cd build; make
-    - name: test
-      run: cd build; make test
 
-  test_win:
+    steps:
+      - uses: actions/checkout@v1
+      - name: cmake
+        run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
+      - name: make
+        run: cd build; make
+      - name: test
+        run: cd build; make test
 
+  win:
     runs-on: windows-latest
-    
+
     steps:
-    - uses: actions/checkout@v1
-    - name: cmake
-      run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
-    - name: make 
-      run: cd build; make tests
-    - name: test
-      run: cd build; make test
+      - uses: actions/checkout@v1
+      - name: cmake
+        run: mkdir build; cd build; cmake -DTEST=true -DJAVA=false -DTRANSPORTS=false -DBUILD_DOC=false -DIN3API=true -DIN3_LIB=false -DCMD=false -DCMAKE_BUILD_TYPE=Debug ..
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..dc2a3e865
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,12 @@
+name: Docker
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build the Docker image
+        run: docker build . --file Dockerfile --tag in3:$(date +%s)
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
new file mode 100644
index 000000000..6d3a6405e
--- /dev/null
+++ b/.github/workflows/wasm.yml
@@ -0,0 +1,28 @@
+name: WASM
+
+on: [push]
+
+jobs:
+  wasm:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Emscripten
+        uses: lovasoa/setup-emscripten@v1
+      - name: configure
+        run: mkdir build; cd build; emconfigure cmake -DWASM=true -DTAG_VERSION=$CI_COMMIT_TAG -DTRANSPORTS=false -DIN3_LIB=false -DBUILD_DOC=false -DIN3API=true -DUSE_CURL=false -DCMD=false -DCMAKE_BUILD_TYPE=MINSIZEREL ..
+      - name: make
+        run: cd build; make
+
+  asmjs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Emscripten
+        uses: lovasoa/setup-emscripten@v1
+      - name: configure
+        run: mkdir build; cd build; emconfigure cmake -DWASM=true -DASMJS=true -DWASM_EMBED=true -DTAG_VERSION=$CI_COMMIT_TAG -DTRANSPORTS=false -DIN3_LIB=false -DBUILD_DOC=false -DIN3API=true -DUSE_CURL=false -DCMD=false -DCMAKE_BUILD_TYPE=MINSIZEREL ..
+      - name: make
+        run: cd build; make

From da3b576c3c40705e50efe4c00dc60e72e4a331c2 Mon Sep 17 00:00:00 2001
From: Simon Jentzsch <simon@slock.it>
Date: Fri, 15 Nov 2019 09:48:55 +0100
Subject: [PATCH 2/2] fix os name

---
 .github/workflows/ccpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index ced9162df..7ac4697b6 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   macos:
-    runs-on: macOS-latest
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v1