From 811262b1fbbabf8933c7b6ac222d7815d7b7b7fc Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Thu, 17 Oct 2024 05:09:33 +0200
Subject: [PATCH] Changing lupdate and lrelease to use pyside6 versions,
 updating images so I no longer have to install node to build.

---
 assets/i18n/release.sh |  2 +-
 assets/i18n/update.sh  |  2 +-
 ci/drone.yml           | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/assets/i18n/release.sh b/assets/i18n/release.sh
index 93475b5..58477c3 100755
--- a/assets/i18n/release.sh
+++ b/assets/i18n/release.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-lrelease *.ts
+pyside6-lrelease *.ts
diff --git a/assets/i18n/update.sh b/assets/i18n/update.sh
index ff96ef8..98f4201 100755
--- a/assets/i18n/update.sh
+++ b/assets/i18n/update.sh
@@ -40,7 +40,7 @@ done
 echo "----------------------------"
 echo "| Updating translations... |"
 echo "----------------------------"
-lupdate -extensions js,qs,qml,py -recursive ../../common/src -recursive ../../runtime-pyside6/LogarithmPlotter -ts lp_*.ts
+pyside6-lupdate -extensions js,qs,qml,py -recursive ../../common/src -recursive ../../runtime-pyside6/LogarithmPlotter -ts lp_*.ts
 # Updating locations in files
 for lp in *.ts; do
     echo "Replacing locations in $lp..."
diff --git a/ci/drone.yml b/ci/drone.yml
index da7d1c7..d49a6d4 100644
--- a/ci/drone.yml
+++ b/ci/drone.yml
@@ -12,28 +12,21 @@ steps:
       - git submodule update --init --recursive
 
   - name: Build
-    image: node:18-bookworm
+    image: ad5001/ubuntu-pyside-xvfb:linux-6-latest-latex-node
     commands:
       - cd common && npm install && cd ..
-      - apt update
-      - apt install -y qtchooser qttools5-dev-tools
-      # Start building 
       - bash scripts/build.sh
-    when:
-      event: [ push, tag ]
 
   - name: Unit Tests
-    image: ad5001/ubuntu-pyside-xvfb:linux-6-latest-latex
+    image: ad5001/ubuntu-pyside-xvfb:linux-6-latest-latex-node
     commands:
-      - apt update
-      - apt install -y npm
       - cd common && npm install -D && cd ..
       - xvfb-run bash scripts/run-tests.sh --no-rebuild
     when:
       event: [ push, tag ]
 
   - name: File Tests
-    image: ad5001/ubuntu-pyside-xvfb:linux-6-latest-latex
+    image: ad5001/ubuntu-pyside-xvfb:linux-6-latest-latex-node
     commands:
       - xvfb-run python3 run.py --test-build --no-check-for-updates
       - xvfb-run python3 run.py --test-build --no-check-for-updates ./ci/test1.lpf