From b5ae0089d1a5af0cce66cdc6af00e569280686e5 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Sat, 9 Jul 2022 09:56:18 +0200
Subject: [PATCH] Single deno step (aligning with other repos) (#396)

* Single deno step (aligning with other repos)

* skip root mod.ts
---
 .eslintrc.cjs                 |  3 ++-
 .github/workflows/pr-any.yml  |  6 +++++-
 .github/workflows/pr-deno.yml | 27 ---------------------------
 package.json                  |  5 +++--
 4 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/pr-deno.yml

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index c037969a..fc110450 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -10,7 +10,8 @@ module.exports = {
     '**/target/*',
     '**/build-wasm/*',
     '**/deno/*.ts',
-    '**/test/*.ts'
+    '**/test/*.ts',
+    '/mod.ts'
   ],
   parserOptions: {
     ...base.parserOptions,
diff --git a/.github/workflows/pr-any.yml b/.github/workflows/pr-any.yml
index 92c419b6..3cbfa898 100644
--- a/.github/workflows/pr-any.yml
+++ b/.github/workflows/pr-any.yml
@@ -5,13 +5,16 @@ jobs:
   pr:
     strategy:
       matrix:
-        step: ['lint', 'test', 'build']
+        step: ['lint', 'test', 'build', 'deno']
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
     env:
       YARN_ENABLE_SCRIPTS: false
     steps:
     - uses: actions/checkout@v2
+    - uses: denoland/setup-deno@v1
+      with:
+        deno-version: vx.x.x
     - name: ${{ matrix.step }}
       if: always()
       run: |
@@ -19,4 +22,5 @@ jobs:
         if [ "${{ matrix.step }}" != "lint" ]; then
           ./scripts/install-build-deps.sh
         fi
+        yarn polkadot-dev-deno-map
         yarn ${{ matrix.step }}
diff --git a/.github/workflows/pr-deno.yml b/.github/workflows/pr-deno.yml
deleted file mode 100644
index 9535978c..00000000
--- a/.github/workflows/pr-deno.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: deno
-on: [pull_request]
-
-jobs:
-  pr:
-    strategy:
-      matrix:
-        step: ['check', 'build']
-    name: ${{ matrix.step }}
-    runs-on: ubuntu-latest
-    env:
-      YARN_ENABLE_SCRIPTS: false
-      WITH_DENO: true
-    steps:
-    - uses: actions/checkout@v2
-    - uses: denoland/setup-deno@v1
-      with:
-        deno-version: vx.x.x
-    - name: ${{ matrix.step }}
-      if: always()
-      run: |
-        yarn install --immutable | grep -v 'YN0013'
-        if [ "${{ matrix.step }}" != "check" ]; then
-          ./scripts/install-build-deps.sh
-        fi
-        yarn polkadot-dev-deno-map
-        yarn deno:${{ matrix.step }}
diff --git a/package.json b/package.json
index fbfb9872..111336f3 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,9 @@
     "build:rollup": "polkadot-exec-rollup --config",
     "build:wasm": "./scripts/build.sh",
     "clean": "./scripts/clean.sh",
-    "deno:build": "yarn build",
-    "deno:check": "yarn build:js && deno check --import-map=import_map.json mod.ts",
+    "deno": "yarn deno:build && yarn deno:check",
+    "deno:build": "WITH_DENO=1 yarn build",
+    "deno:check": "deno check --import-map=import_map.json mod.ts",
     "lint": "polkadot-dev-run-lint",
     "postinstall": "polkadot-dev-yarn-only",
     "test": "yarn test:wasm-crypto:rust",