fix: revert ci changes

.github/helper/install.sh

@@ -2,10 +2,6 @@
 set -e
 cd ~ || exit
 
-sudo apt update
-sudo apt remove mysql-server mysql-client
-sudo apt install libcups2-dev redis-server mariadb-client-10.6
-
 echo "Setting Up Bench..."
 
 pip install frappe-bench
@@ -23,16 +19,14 @@ mkdir ~/frappe-bench/sites/lms.test
 cp "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/lms.test/site_config.json
 
 
-mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'";
+mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "SET GLOBAL character_set_server = 'utf8mb4'";
-mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";
+mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";
 
-mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE DATABASE test_lms";
+mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "CREATE DATABASE test_lms";
-mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE USER 'test_lms'@'localhost' IDENTIFIED BY 'test_lms'";
+mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "CREATE USER 'test_lms'@'localhost' IDENTIFIED BY 'test_lms'";
-mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "GRANT ALL PRIVILEGES ON \`test_lms\`.* TO 'test_lms'@'localhost'";
+mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "GRANT ALL PRIVILEGES ON \`test_lms\`.* TO 'test_lms'@'localhost'";
 
-mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES";
+mariadb --host 127.0.0.1 --port 3306 -u root -p123 -e "FLUSH PRIVILEGES";
-
-cd ~/frappe-bench || exit
 
 echo "Setting Up Procfile..."
 
@@ -42,10 +36,11 @@ sed -i 's/^schedule:/# schedule:/g' Procfile
 echo "Starting Bench..."
 
 bench start &> bench_start.log &
+
 CI=Yes bench build &
+build_pid=$!
+
 bench --site lms.test reinstall --yes
-
-bench get-app hrms
-
 bench --site lms.test install-app lms
-bench setup requirements --dev
+
+wait $build_pid

.github/workflows/ci.yml

@@ -1,11 +1,9 @@
 name: Server Tests
-
 on:
   push:
     branches:
       - main
   pull_request: {}
-
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -23,70 +21,60 @@ jobs:
         ports:
           - 12000:6379
       mariadb:
-        image: mariadb:10.6
+        image: anandology/mariadb-utf8mb4:10.3
         ports:
           - 3306:3306
         env:
-          MARIADB_ROOT_PASSWORD: root
+          MYSQL_ROOT_PASSWORD: root
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
     steps:
-    - name: Checkout code
+    - uses: actions/checkout@v2
-      uses: actions/checkout@v2
+    - name: setup python
-
-    - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.11'
+        python-version: '3.10'
-
+    - name: setup node
-    - name: Set up Node
       uses: actions/setup-node@v2
       with:
-        node-version: 18
+        node-version: '18'
         check-latest: true
-
+    - name: setup cache for bench
-    - name: Add to Hosts
-      run: echo "127.0.0.1 lms.test" | sudo tee -a /etc/hosts
-
-    - name: Cache pip
       uses: actions/cache@v2
       with:
-        path: ~/.cache/pip
+        path: ~/bench-cache
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
+        key: ${{ runner.os }}
-        restore-keys: |
+    - name: install bench
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-
-    - name: Cache node modules
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-node-modules
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - uses: actions/cache@v2
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-
-    - name: Install
       run: |
-        bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
+        pip3 install frappe-bench
-
+        which bench
-    - name: Run Tests
+    - name: bench init
-      run: cd ~/frappe-bench/ && bench --site lms.test run-parallel-tests --app lms --total-builds 2 --build-number ${{ matrix.container }}
+      run: |
-      env:
+        if [ -d ~/bench-cache/bench.tgz ]
-        TYPE: server
+        then
-        CI_BUILD_ID: ${{ github.run_id }}
+           (cd && tar xzf ~/bench-cache/bench.tgz)
-        ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
+        else
+          bench init ~/frappe-bench --skip-redis-config-generation --skip-assets --python "$(which python)"
+          mkdir -p ~/bench-cache
+          (cd && tar czf ~/bench-cache/bench.tgz frappe-bench)
+        fi
+    - name: add lms app to bench
+      working-directory: /home/runner/frappe-bench
+      run: bench get-app lms $GITHUB_WORKSPACE
+    - name: create bench site
+      working-directory: /home/runner/frappe-bench
+      run: bench new-site --mariadb-root-password root --admin-password admin frappe.local
+    - name: install lms app
+      working-directory: /home/runner/frappe-bench
+      run: bench --site frappe.local install-app lms
+    - name: setup requirements
+      working-directory: /home/runner/frappe-bench
+      run: bench setup requirements --dev
+    - name: allow tests
+      working-directory: /home/runner/frappe-bench
+      run: bench --site frappe.local set-config allow_tests true
+    - name: bench build
+      working-directory: /home/runner/frappe-bench
+      run: bench --site frappe.local build
+    - name: run tests
+      working-directory: /home/runner/frappe-bench
+      run: bench --site frappe.local run-tests --app lms