From fadbddff2edd80a7a2947c74100e2d80c72b336f Mon Sep 17 00:00:00 2001
From: Akhil Narang <me@akhilnarang.dev>
Date: Mon, 16 Dec 2024 14:04:03 +0530
Subject: [PATCH 1/2] refactor(ci): don't fetch actions from develop

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
---
 .github/workflows/_base-migration.yml    | 3 ++-
 .github/workflows/_base-server-tests.yml | 7 ++++---
 .github/workflows/_base-ui-tests.yml     | 3 ++-
 .github/workflows/server-tests.yml       | 6 +++---
 .github/workflows/ui-tests.yml           | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

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' }}

From c0d0a137ecea946de7fdbdd028a66948a7dc78dd Mon Sep 17 00:00:00 2001
From: Akhil Narang <me@akhilnarang.dev>
Date: Mon, 16 Dec 2024 16:06:37 +0530
Subject: [PATCH 2/2] fix(ci): drop ubuntu version check for wkhtmltopdf

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
---
 .github/actions/setup/action.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 4e0e4b0175..862ffcef1c 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -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"