diff --git a/.github/workflows/_base-migration.yml b/.github/workflows/_base-migration.yml index e50cc24011..a0d71eb5a0 100644 --- a/.github/workflows/_base-migration.yml +++ b/.github/workflows/_base-migration.yml @@ -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 }} diff --git a/.github/workflows/_base-server-tests.yml b/.github/workflows/_base-server-tests.yml index 3afdb3c808..5b206f2c4d 100644 --- a/.github/workflows/_base-server-tests.yml +++ b/.github/workflows/_base-server-tests.yml @@ -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 diff --git a/.github/workflows/_base-ui-tests.yml b/.github/workflows/_base-ui-tests.yml index dafb58e81a..3e3b6aeee0 100644 --- a/.github/workflows/_base-ui-tests.yml +++ b/.github/workflows/_base-ui-tests.yml @@ -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 }} diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml index 9df72f1fa9..dbe70dce91 100644 --- a/.github/workflows/server-tests.yml +++ b/.github/workflows/server-tests.yml @@ -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' diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index e9b3ca2435..b175f0c939 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -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' }}