Переглянути джерело

ci: Separate PY / conflict validation step, merge install

version-14
Gavin D'souza 2 роки тому
джерело
коміт
448f9573f5
5 змінених файлів з 45 додано та 37 видалено
  1. +0
    -7
      .github/helper/install_dependencies.sh
  2. +12
    -9
      .github/workflows/patch-mariadb-tests.yml
  3. +11
    -7
      .github/workflows/server-mariadb-tests.yml
  4. +11
    -7
      .github/workflows/server-postgres-tests.yml
  5. +11
    -7
      .github/workflows/ui-tests.yml

+ 0
- 7
.github/helper/install_dependencies.sh Переглянути файл

@@ -2,13 +2,6 @@

set -e

# Check for merge conflicts before proceeding
python -m compileall -f "${GITHUB_WORKSPACE}"
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
then echo "Found merge conflicts"
exit 1
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
tar -xf /tmp/wkhtmltox.tar.xz -C /tmp


+ 12
- 9
.github/workflows/patch-mariadb-tests.yml Переглянути файл

@@ -30,6 +30,14 @@ jobs:
- name: Clone
uses: actions/checkout@v3

- 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: "gabrielfalcao/pyenv-action@v9"
with:
@@ -92,22 +100,17 @@ jobs:
${{ runner.os }}-yarn-

- name: Install Dependencies
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
env:
BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
TYPE: server

- name: Install
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
pip install frappe-bench
pyenv global $(pyenv versions | grep '3.10')
bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
DB: mariadb
BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
TYPE: server
DB: mariadb

- name: Run Patch Tests
if: ${{ steps.check-build.outputs.build == 'strawberry' }}


+ 11
- 7
.github/workflows/server-mariadb-tests.yml Переглянути файл

@@ -44,6 +44,14 @@ jobs:
with:
python-version: '3.10'

- 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: Check if build should be run
id: check-build
run: |
@@ -104,18 +112,14 @@ jobs:

- name: Install Dependencies
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
TYPE: server

- name: Install
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
DB: mariadb
TYPE: server

- name: Run Tests
if: ${{ steps.check-build.outputs.build == 'strawberry' }}


+ 11
- 7
.github/workflows/server-postgres-tests.yml Переглянути файл

@@ -47,6 +47,14 @@ jobs:
with:
python-version: '3.10'

- 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: Check if build should be run
id: check-build
run: |
@@ -107,18 +115,14 @@ jobs:

- name: Install Dependencies
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
TYPE: server

- name: Install
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
DB: postgres
TYPE: server

- name: Run Tests
if: ${{ steps.check-build.outputs.build == 'strawberry' }}


+ 11
- 7
.github/workflows/ui-tests.yml Переглянути файл

@@ -43,6 +43,14 @@ jobs:
with:
python-version: '3.10'

- 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: Check if build should be run
id: check-build
run: |
@@ -113,18 +121,14 @@ jobs:

- name: Install Dependencies
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
BEFORE: ${{ env.GITHUB_EVENT_PATH.before }}
AFTER: ${{ env.GITHUB_EVENT_PATH.after }}
TYPE: ui

- name: Install
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
env:
DB: mariadb
TYPE: ui

- name: Instrument Source Code
if: ${{ steps.check-build.outputs.build == 'strawberry' }}


Завантаження…
Відмінити
Зберегти