Merge pull request #28782 from akhilnarang/use-actions-directly

refactor(ci): don't fetch actions from develop
This commit is contained in:
Akhil Narang 2024-12-16 16:25:23 +05:30 committed by GitHub
commit dc85db263b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 14 additions and 16 deletions

View file

@ -150,13 +150,8 @@ runs:
sudo apt -qq remove mysql-server mysql-client
sudo apt -qq install libcups2-dev redis-server mariadb-client
if [ "$(lsb_release -rs)" = "22.04" ]; then
wget -q -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
sudo apt install /tmp/wkhtmltox.deb
else
echo "Please update frappe/.github/lib/tests.yml to support wkhtmltopdf for $(lsb_release -ds)"
exit 1
fi
wget -q -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
sudo apt install /tmp/wkhtmltox.deb
end_time=$(date +%s)
echo -e "\033[33mInstall System Dependencies: $((end_time - start_time)) seconds\033[0m"

View file

@ -40,7 +40,8 @@ jobs:
env:
MARIADB_ROOT_PASSWORD: ${{ env.DB_ROOT_PASSWORD }}
steps:
- uses: frappe/frappe/.github/actions/setup@develop
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
name: Environment Setup
with:
python-version: ${{ inputs.python-version }}

View file

@ -90,7 +90,8 @@ jobs:
- 2525:25
- 3000:80
steps:
- uses: frappe/frappe/.github/actions/setup@develop
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
name: Environment Setup
with:
python-version: ${{ inputs.python-version }}
@ -120,10 +121,10 @@ jobs:
file_path=$(echo "$file_info" | cut -d':' -f1)
line_number=$(echo "$file_info" | cut -d':' -f2)
warning_type=$(echo "$warning" | grep -oP '\w+Warning')
# Extract the actual warning message
message=$(echo "$warning" | sed -E "s/^.*$warning_type: //")
# Create the annotation
echo "::warning file=${file_path},line=${line_number}::${warning_type}: ${message}"
done

View file

@ -63,7 +63,8 @@ jobs:
env:
MARIADB_ROOT_PASSWORD: ${{ env.DB_ROOT_PASSWORD }}
steps:
- uses: frappe/frappe/.github/actions/setup@develop
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
name: Environment Setup
with:
python-version: ${{ inputs.python-version }}

View file

@ -20,7 +20,7 @@ permissions:
jobs:
typecheck:
name: Types
uses: frappe/frappe/.github/workflows/_base-type-check.yml@develop
uses: ./.github/workflows/_base-type-check.yml
checkrun:
name: Plan Tests
@ -42,7 +42,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
test:
name: Tests
uses: frappe/frappe/.github/workflows/_base-server-tests.yml@develop
uses: ./.github/workflows/_base-server-tests.yml
with:
enable-postgres: true # This will test against both MariaDB and PostgreSQL
parallel-runs: 2
@ -54,7 +54,7 @@ jobs:
migrate:
name: Migration
needs: checkrun
uses: frappe/frappe/.github/workflows/_base-migration.yml@develop
uses: ./.github/workflows/_base-migration.yml
with:
db-artifact-url: https://frappeframework.com/files/v13-frappe.sql.gz
python-version: '3.10'

View file

@ -41,7 +41,7 @@ jobs:
test:
name: Tests (Cypress)
uses: frappe/frappe/.github/workflows/_base-ui-tests.yml@develop
uses: ./.github/workflows/_base-ui-tests.yml
with:
parallel-runs: 3
enable-coverage: ${{ github.event_name != 'pull_request' }}