Play with actions

Akaflieg-Freiburg · Dec 3, 2023 · 024ccb5 · 024ccb5
1 parent 42cc128
commit 024ccb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -2,7 +2,7 @@ name: Compile on Linux
 
 on:
   push:
-    branches: [ main ]
+    branches: [ feature/actions ]
 
 jobs:
   build:
@@ -26,21 +26,12 @@ jobs:
         key: linux
     - name: Compile and Install
       run: |
-        $Qt6_DIR/bin/qt-cmake \
-        -S maplibre-native-qt \
-        -B build \
-        -DMLN_QT_WITH_INTERNAL_ICU=ON \
-        -DBUILD_TESTING=OFF \
-        -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
-        -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
-        -DCMAKE_INSTALL_PREFIX=gcc_64
-        cmake --build build
-        cmake --build build --target install
+        Qt6_DIR_BASE=$(dirname "$Qt6_DIR") ./buildscript-linux.sh
     - name: Package
       run: |
-        tar cvfz enrouteDependencies_linux.tar.gz gcc_64
+        tar cvfz enrouteDependencies_Qt$(filename $(dirname $(dirname "$Qt6_DIR")))_linux.tar.gz Qt
     - name: Upload to developerBuilds
       run: |
         gh release upload --clobber developerBuilds *.tar.gz
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/buildscript-linux.sh b/buildscript-linux.sh
@@ -3,6 +3,7 @@
 # Fail on first error
 set -e
 
+installDir=Qt/$(basename "$Qt6_DIR_BASE")/gcc_64
 
 echo
 echo "Linux Desktop"
@@ -16,6 +17,6 @@ $Qt6_DIR_BASE/gcc_64/bin/qt-cmake \
     -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
     -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
     -DCMAKE_PREFIX_PATH=$Qt6_DIR_BASE/gcc_64 \
-    -DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/gcc_64
+    -DCMAKE_INSTALL_PREFIX=$installDir
 cmake --build build-maplibre-native-qt-linux
 cmake --install build-maplibre-native-qt-linux