Merge pull request #2248 from frappe/develop

chore(release): dev to main

Author: RitvikSardana

.github/helpers/install.sh

@@ -6,11 +6,11 @@ cd ~ || ex
 
 sudo apt update
 sudo apt remove mysql-server mysql-client
-sudo apt install libcups2-dev redis-server mariadb-client-10.6
+sudo apt install libcups2-dev redis-server mariadb-client libmariadb-dev
 
 pip install frappe-bench
 
-git clone "https://github.com/frappe/frappe" --branch "develop" --depth 1
+git clone "https://github.com/frappe/frappe" --branch "develop" --depth 1 
 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
 
 mkdir ~/frappe-bench/sites/test_site
@@ -19,23 +19,20 @@ cp -r "${GITHUB_WORKSPACE}/.github/helpers/site_config_mariadb.json" ~/frappe-be
 
 mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'"
 mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+
 mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
 mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "CREATE DATABASE test_frappe"
 mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
+
 mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES"
 
 install_whktml() {
-	if [ "$(lsb_release -rs)" = "22.04" ]; then
-		wget -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 this script to support wkhtmltopdf for $(lsb_release -ds)"
-		exit 1
-	fi
+    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
+    sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
+    sudo chmod o+x /usr/local/bin/wkhtmltopdf
 }
 install_whktml &
-wkpid=$!
-
 
 cd ~/frappe-bench || exit
 
@@ -47,8 +44,7 @@ sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 bench get-app helpdesk "${GITHUB_WORKSPACE}"
 bench setup requirements --dev
 
-wait $wkpid
 
-bench start &> bench_run_logs.txt &
-CI=Yes bench build &
+bench start &>> ~/frappe-bench/bench_start.log &
+CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - develop
     tags:
       - "*"
 
@@ -38,11 +39,12 @@ jobs:
 
       - name: Set Branch
         run: |
-          export APPS_JSON='[{"url": "https://github.com/frappe/helpdesk","branch": "main"}]'
+          export APPS_JSON='[{"url": "https://github.com/frappe/helpdesk","branch": ${{ github.ref_name }}}]'
           echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV
           echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV
 
       - name: Set Image Tag
+        if: github.ref_name == 'main'
         run: |
           echo "IMAGE_TAG=stable" >> $GITHUB_ENV
 

.github/workflows/server-tests.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - develop
 
     paths-ignore:
       - '**.js'
@@ -25,7 +26,7 @@ on:
         type: string
 
 concurrency:
-  group: server-mariadb-develop-${{ github.event_name }}-${{ github.event.number || github.event_name == 'workflow_dispatch' && github.run_id || '' }}
+  group: develop-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
@@ -37,14 +38,23 @@ jobs:
     strategy:
       fail-fast: false
 
+    services:
+        mysql:
+          image: mariadb:10.6
+          env:
+            MARIADB_ROOT_PASSWORD: 'root'
+          ports:
+            - 3306:3306
+          options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
     steps:
       - name: Clone
         uses: actions/checkout@v2
 
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.11'
+          python-version: '3.10'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -99,24 +109,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Setup MariaDB
-        uses: getong/mariadb-action@v1.1
-        with:
-          collation server: 'utf8mb4_unicode_ci'
-          mariadb version: '10.6'
-          mysql root password: 'root'
-
       - name: Install
         run: bash ${GITHUB_WORKSPACE}/.github/helpers/install.sh
         env:
           TYPE: server
           FRAPPE_USER: ${{ github.event.inputs.user }}
           FRAPPE_BRANCH: ${{ github.event.inputs.branch }}
 
-      - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app helpdesk'
-        env:
-          TYPE: server
-          CI_BUILD_ID: ${{ github.run_id }}
-          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
+      # - name: Run Tests
+      #   run: 'cd ~/frappe-bench/ && bench --site test_site run-tests --app helpdesk'
+      #   env:
+      #     TYPE: server
+      #     CI_BUILD_ID: ${{ github.run_id }}
+      #     ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
 

desk/package.json

@@ -17,13 +17,12 @@
     "@tailwindcss/typography": "^0.5.9",
     "@tiptap/core": "^2.2.4",
     "@vee-validate/zod": "^4.8.2",
-    "@vitejs/plugin-vue": "^4.0.0",
     "@vueuse/core": "^10.0.2",
     "@vueuse/integrations": "^12.0.0",
     "autoprefixer": "^10.4.13",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.1",
-    "frappe-ui": "0.1.119",
+    "frappe-ui": "0.1.122",
     "lodash": "^4.17.21",
     "lucide-static": "^0.276.0",
     "mime": "^3.0.0",
@@ -36,18 +35,20 @@
     "unplugin-icons": "^0.16.1",
     "unplugin-vue-components": "^0.25.2",
     "vee-validate": "^4.8.2",
-    "vite": "^4.4.9",
     "vue": "^3.4.12",
     "vue-echarts": "^6.5.4",
     "vue-router": "^4.2.2",
     "vuedraggable": "^4.1.0",
     "gemoji": "^8.1.0",
-    "zod": "^3.21.4"
+    "zod": "^3.21.4",
+    "@vitejs/plugin-vue": "^4.2.3"
   },
   "resolutions": {
     "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
+    "vite": "^4.4.9",
+    "@vitejs/plugin-vue-jsx": "^3.0.1",
     "vite-plugin-pwa": "^0.20.5",
     "typescript": "^5.0.2",
     "prettier": "2.8.4"

desk/src/App.vue

@@ -12,7 +12,8 @@ import { createToast } from "@/utils";
 import { useConfigStore } from "@/stores/config";
 import KeymapDialog from "@/pages/KeymapDialog.vue";
 import { stopSession } from "@/telemetry";
-import { Dialogs } from "frappe-ui";
+import { Dialogs } from "@/components/dialogs";
+
 useConfigStore();
 
 onMounted(() => {

desk/src/assets/Inter/Inter-Black.woff

@@ -3,7 +3,7 @@
     <Popover v-model:show="showOptions" class="w-full">
       <template #target="{ open: openPopover, togglePopover }">
         <slot name="target" v-bind="{ open: openPopover, togglePopover }">
-          <div class="w-full">
+          <div class="w-full -ml-0.5">
             <button
               class="flex w-full items-center justify-between focus:outline-none"
               :class="inputClasses"

desk/src/assets/Inter/Inter-Black.woff2

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="normalActions.length">
+  <div v-if="normalActions.length" class="flex gap-2">
     <Button
       v-for="action in normalActions"
       :key="action.label"