ci: Fix Github Action (#12574)

.github/helper/install.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-cd ~ || exit
+set -e
 
-# shellcheck disable=SC1091
-source ./.nvm/nvm.sh
-nvm install 12
+cd ~ || exit
 
 pip install frappe-bench
 

.github/helper/install_dependencies.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 
-python "${GITHUB_WORKSPACE}/.github/helper/roulette.py"
-if [[ $? != 2 ]];then
-  exit;
-fi
+set -e
+
+# python "${GITHUB_WORKSPACE}/.github/helper/roulette.py"
+# if [[ $? != 2 ]];then
+#   exit;
+# fi
 
  # install wkhtmltopdf
 wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz

.github/helper/roulette.py

@@ -24,10 +24,12 @@ def is_docs(file):
 
 if __name__ == "__main__":
     build_type = os.environ.get("TYPE")
-    commit_range = os.environ.get("TRAVIS_COMMIT_RANGE")
+    before = os.environ.get("BEFORE")
+    after = os.environ.get("AFTER")
+    commit_range = before + '...' + after
     print("Build Type: {}".format(build_type))
     print("Commit Range: {}".format(commit_range))
-    
+
     try:
         files_changed = get_output("git diff --name-only {}".format(commit_range), shell=False)
     except Exception:

.github/helper/run_tests.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-cd ~/frappe-bench/ || exit
-
-if [ "$TYPE" == "server" ]; then
-
-  if [ "$DB" == "mariadb" ]; then
-    bench --verbose --site test_site run-tests --coverage
-  fi
-
-  if [ "$DB" == "postgres" ]; then
-    bench --verbose --site test_site run-tests --coverage
-  fi
-
-fi
-
-if [ "$TYPE" == "ui" ]; then
-  bench --site test_site execute frappe.utils.install.complete_setup_wizard
-  bench --site test_site run-ui-tests frappe --headless
-fi

.github/workflows/ci-tests.yml

@@ -15,12 +15,17 @@ jobs:
         - DB: "mariadb"
           TYPE: "server"
           JOB_NAME: "Python MariaDB"
+          RUN_COMMAND: bench --verbose --site test_site run-tests --coverage
+
         - DB: "postgres"
           TYPE: "server"
           JOB_NAME: "Python PostgreSQL"
+          RUN_COMMAND: bench --verbose --site test_site run-tests --coverage
+
         - DB: "mariadb"
           TYPE: "ui"
           JOB_NAME: "UI MariaDB"
+          RUN_COMMAND:  bench --site test_site run-ui-tests frappe --headless
 
     name: ${{ matrix.JOB_NAME }}
 
@@ -54,6 +59,11 @@ jobs:
         with:
           python-version: 3.7
 
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '12'
+          check-latest: true
+
       - name: Add to Hosts
         run: |
           echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
@@ -103,6 +113,10 @@ jobs:
 
       - name: Install Dependencies
         run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
+        env:
+          BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
+          AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
+          TYPE: ${{ matrix.TYPE }}
 
       - name: Install
         run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
@@ -110,8 +124,15 @@ jobs:
           DB: ${{ matrix.DB }}
           TYPE: ${{ matrix.TYPE }}
 
+      - name: Run Set-Up
+        if: matrix.TYPE == 'ui'
+        run: cd ~/frappe-bench/ && bench --site test_site execute frappe.utils.install.complete_setup_wizard
+        env:
+          DB: ${{ matrix.DB }}
+          TYPE: ${{ matrix.TYPE }}
+
       - name: Run Tests
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/run_tests.sh
+        run: cd ~/frappe-bench/ && ${{ matrix.RUN_COMMAND }}
         env:
           DB: ${{ matrix.DB }}
           TYPE: ${{ matrix.TYPE }}