From c11a661a379a81e16694f2421c83122a6f9ef434 Mon Sep 17 00:00:00 2001
From: SeeLook <seelook@gmail.com>
Date: Wed, 12 Feb 2025 16:45:25 +0100
Subject: [PATCH] [CD/CI] fix Nootka version, use Ninja
---
.github/workflows/make_deploy.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/make_deploy.yml b/.github/workflows/make_deploy.yml
index e475a2ce..860c6e3d 100644
--- a/.github/workflows/make_deploy.yml
+++ b/.github/workflows/make_deploy.yml
@@ -30,7 +30,7 @@ jobs:
- name: Set variables
run: |
- VER=$(cat src/libs/core/nootkaconfig.h | awk -F" " '{ print $3 }' | sed 's/\"//g')
+ VER=$(cat src/core/nootkaconfig.h | awk -F" " '{ print $3 }' | sed 's/\"//g')
echo "NOOTKA_VERSION=$VER" >> $GITHUB_ENV
CNT=$(git rev-list HEAD --count)
echo "NOOTKA_COM_CNT=$CNT" >> $GITHUB_ENV
@@ -46,7 +46,7 @@ jobs:
- name: 'Install dependencies'
run: |
sudo apt-get update
- sudo apt-get install -y mesa-common-dev libsoundtouch-dev libfftw3-dev libasound2-dev libogg-dev libvorbis-dev libpulse-dev libjack-dev rsync git
+ sudo apt-get install -y mesa-common-dev libsoundtouch-dev libfftw3-dev libasound2-dev libogg-dev libvorbis-dev libpulse-dev libjack-dev rsync git ninja-build
sudo apt-get install -y libgl1-mesa-dev libxkbcommon-x11-0 rpm libfuse2 fakeroot
- name: 'Install CMake'
@@ -60,7 +60,7 @@ jobs:
export PATH=/home/runner/work/${{env.EXECUTABLE}}/Qt/${{env.QT_VERSION_LINUX}}/gcc_64/libexec:$PATH
mkdir build
cd build
- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DQT_QMAKE_EXECUTABLE=/home/runner/work/${{env.EXECUTABLE}}/Qt/${{env.QT_VERSION_LINUX}}/gcc_64/bin/qmake ../
+ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DQT_QMAKE_EXECUTABLE=/home/runner/work/${{env.EXECUTABLE}}/Qt/${{env.QT_VERSION_LINUX}}/gcc_64/bin/qmake ../
- name: 'Build application'
run: |
--
GitLab