From 8f6b561b6756d0688bbb2b6aae6130083d4a1a97 Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Thu, 22 Aug 2024 15:46:33 +0530 Subject: [PATCH] fix: new post_install.yml --- .github/helper/install.sh | 4 - .github/workflows/patch.yml | 14 ++-- .github/workflows/post_install.yml | 117 +++++++++++++++++++++++++++++ india_compliance/install.py | 1 + 4 files changed, 125 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/post_install.yml diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 97486a860b..83bab4e902 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -59,10 +59,6 @@ sed -i 's/socketio:/# socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile bench get-app erpnext --branch "$BRANCH_TO_CLONE" --resolve-deps -bench --site test_site restore 20240822_151612-patch_test_localhost-database.sql.gz - -bench remove-app india_compliance --force - bench get-app india_compliance "${GITHUB_WORKSPACE}" bench setup requirements --dev diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index be1b797eab..a25e5f6968 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -1,13 +1,13 @@ name: Patch on: - # pull_request: - # paths-ignore: - # - '**.js' - # - '**.css' - # - '**.md' - # - '**.html' - # - '**.csv' + pull_request: + paths-ignore: + - '**.js' + - '**.css' + - '**.md' + - '**.html' + - '**.csv' workflow_dispatch: concurrency: diff --git a/.github/workflows/post_install.yml b/.github/workflows/post_install.yml new file mode 100644 index 0000000000..13f7c9614b --- /dev/null +++ b/.github/workflows/post_install.yml @@ -0,0 +1,117 @@ +name: Patch + +on: + pull_request: + paths-ignore: + - '**.js' + - '**.css' + - '**.md' + - '**.html' + - '**.csv' + workflow_dispatch: + +concurrency: + group: patch-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }} + cancel-in-progress: true + +jobs: + test: + runs-on: ubuntu-latest + timeout-minutes: 60 + + name: Patch Test + + services: + mariadb: + image: mariadb:10.6 + env: + MARIADB_ROOT_PASSWORD: 'travis' + ports: + - 3306:3306 + options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3 + + steps: + - name: Clone + uses: actions/checkout@v4 + + - name: Check for valid Python & Merge Conflicts + run: | + python -m compileall -f "${GITHUB_WORKSPACE}" + if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}" + then echo "Found merge conflicts" + exit 1 + fi + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: 18 + check-latest: true + + - name: Add to Hosts + run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts + + - name: Cache pip + uses: actions/cache@v4 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }} + restore-keys: | + ${{ runner.os }}-pip- + ${{ runner.os }}- + + - name: Cache node modules + uses: actions/cache@v4 + 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@v4 + 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 + env: + BRANCH_TO_CLONE: ${{ github.base_ref }} + + - name: Run Patch Tests + run: | + cd ~/frappe-bench/ + bench remove-app india_compliance --force + jq 'del(.install_apps)' ~/frappe-bench/sites/test_site/site_config.json > tmp.json + mv tmp.json ~/frappe-bench/sites/test_site/site_config.json + + bench --site test_site restore 20240822_151612-patch_test_localhost-database.sql.gz + + echo "Updating to latest version" + git -C "apps/frappe" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" + git -C "apps/erpnext" checkout -q -f "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" + git -C "apps/india_compliance" checkout -q -f "$GITHUB_SHA" + + pgrep honcho | xargs kill + rm -rf ~/frappe-bench/env + bench -v setup env + bench pip install -e ./apps/erpnext + bench pip install -e ./apps/india_compliance + bench start &>> ~/frappe-bench/bench_start.log & \ No newline at end of file diff --git a/india_compliance/install.py b/india_compliance/install.py index ef954b4424..a66164386e 100644 --- a/india_compliance/install.py +++ b/india_compliance/install.py @@ -21,6 +21,7 @@ "update_gst_accounts", # this is an India Compliance patch, but needs priority "update_itc_amounts", ## India Compliance + "set_gst_tax_type123", "set_gst_tax_type", "update_state_name_to_puducherry", "rename_import_of_capital_goods",