From dc173bab0a084e00d29123dfbd07d9f58486497f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 17 Jul 2020 18:14:16 +0200
Subject: [PATCH] fixup! Github action for emscripten nightly builds

---
 .github/workflows/nightly-emscripten.yml | 30 +++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly-emscripten.yml b/.github/workflows/nightly-emscripten.yml
index 59f7aef79..f7f00e26e 100644
--- a/.github/workflows/nightly-emscripten.yml
+++ b/.github/workflows/nightly-emscripten.yml
@@ -15,6 +15,7 @@ jobs:
   build-emscripten-nightly:
     runs-on: ubuntu-latest
     outputs:
+      solidity-version: ${{ env.SOLIDITY_VERSION }}
       nightly-version: ${{ env.NIGHTLY_VERSION }}
       matching-nightlies-in-the-repo: ${{ env.MATCHING_NIGHTLIES_IN_THE_REPO }}
 
@@ -48,6 +49,7 @@ jobs:
           )"
           nightly_version="v${solidity_version}-nightly.${last_commit_date}+commit.${last_commit_hash}"
 
+          echo "::set-env name=SOLIDITY_VERSION::${solidity_version}"
           echo "::set-env name=NIGHTLY_VERSION::${nightly_version}"
           echo "::set-env name=MATCHING_NIGHTLIES_IN_THE_REPO::${matching_nightlies_in_the_repo}"
 
@@ -65,10 +67,36 @@ jobs:
           name: soljson.js
           path: solidity/upload/soljson.js
 
-  add-nightly-and-push:
+
+  test-emscripten-nightly:
     runs-on: ubuntu-latest
     needs: build-emscripten-nightly
 
+    env:
+      SOLIDITY_VERSION: ${{ needs.build-emscripten-nightly.outputs.solidity-version }}
+
+    if: "!needs.build-emscripten-nightly.outputs.matching-nightlies-in-the-repo"
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          repository: 'ethereum/solidity'
+
+      - name: Download soljson.js artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: soljson.js
+
+      - name: Run solc-js tests
+        run: |
+          test/externalTests/solc-js/solc-js.sh "${PWD}/soljson.js" "$SOLIDITY_VERSION"
+
+
+  add-nightly-and-push:
+    runs-on: ubuntu-latest
+    needs:
+      - build-emscripten-nightly
+      - test-emscripten-nightly
+
     env:
       NIGHTLY_VERSION: ${{ needs.build-emscripten-nightly.outputs.nightly-version }}