Merge pull request #986 from arnost00/update-action-build-qe2

Update build - replaced deprecated Node.js version
Quick-Box · Oct 26, 2024 · 0944455 · 0944455
2 parents 67da9a3 + 536a1fa
commit 0944455
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -13,12 +13,12 @@ jobs:
   build_linux:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         cache: 'true'
         version: ${{ env.QT_VERSION }}
@@ -42,13 +42,13 @@ jobs:
         ./quickevent/make-dist.sh --src-dir . --qt-dir ${Qt5_DIR} --work-dir ./build --appimage-tool /opt/appimagetool-x86_64.AppImage 
 
     - name: Save AppImage
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: quickevent-${{ env.VERSION }}-linux64.Appimage
         path: build/artifacts/quickevent-*-linux64.AppImage
 
     - name: Save gzip
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: quickevent-${{ env.VERSION }}-linux64.tgz
         path: build/artifacts/quickevent-*-linux64.tgz
@@ -61,13 +61,13 @@ jobs:
         shell: bash
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
 
     - name: Cache Libs
       id: cache-libs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           C:/openssl/bin/libssl-1_1-x64.dll
@@ -87,7 +87,7 @@ jobs:
       shell: cmd
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         cache: 'true'
         version: ${{ env.QT_VERSION }}
@@ -107,11 +107,11 @@ jobs:
     - name: Create installer
       run: |
         choco install innosetup --no-progress
-        "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "/DVERSION=%VERSION%" "/DQT_DIR=%Qt5_Dir%" "/DPSQL_DIR=C:/Program Files/PostgreSQL/14" "/DSSL_DIR=C:\openssl\bin" quickevent/quickevent.iss
+        "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "/DVERSION=%VERSION%" "/DQT_DIR=%QT_ROOT_DIR%" "/DPSQL_DIR=C:/Program Files/PostgreSQL/14" "/DSSL_DIR=C:\openssl\bin" quickevent/quickevent.iss
       shell: cmd
 
     - name: Save setup
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: quickevent-${{ env.VERSION }}-win64-setup.exe
         path: _inno\quickevent\quickevent-${{ env.VERSION }}-win64-setup.exe
diff --git a/quickevent/make-dist.sh b/quickevent/make-dist.sh
@@ -113,10 +113,11 @@ echo APP_NAME: $APP_NAME
 echo SRC_DIR: $SRC_DIR
 echo WORK_DIR: $WORK_DIR
 echo NO_CLEAN: $NO_CLEAN
+echo QT_ROOT_DIR: $QT_ROOT_DIR
 
 if [ -z $USE_SYSTEM_QT ]; then
-	QT_LIB_DIR=$QT_DIR/lib
-	QMAKE=$QT_DIR/bin/qmake
+	QT_LIB_DIR=$QT_ROOT_DIR/lib
+	QMAKE=$QT_ROOT_DIR/bin/qmake
 	DISTRO_NAME=$APP_NAME-$APP_VER-linux64
 else
 	QT_DIR=/usr/lib/i386-linux-gnu/qt5