From 7467a783fa9ac13e4d598e91be9b04c3cbf66058 Mon Sep 17 00:00:00 2001 From: Roman Vladimirov Date: Wed, 27 Dec 2023 21:38:38 +0300 Subject: [PATCH 1/4] Update deb-package.yml --- .github/workflows/deb-package.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deb-package.yml b/.github/workflows/deb-package.yml index 194508f..d68142b 100644 --- a/.github/workflows/deb-package.yml +++ b/.github/workflows/deb-package.yml @@ -2,28 +2,27 @@ name: PackageDeb on: push: - branches: [ "deploy" ] + branches: [ "main" ] jobs: build: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 - - name: apt-update - run: sudo apt-get update -qq - - name: apt get qt - run: sudo apt-get install -y --no-install-recommends qt6-base-dev libqt6websockets6-dev libqt6svg6-dev qt6-declarative-dev qml6-module-qtquick qml6-module-qtquick-controls qml6-module-qtquick-dialogs qml6-module-qtquick-templates qml6-module-qtquick-window qml6-module-qtquick-layouts qml6-module-qtqml-workerscript qml-qt6 libqt6quick6 libqt6quickcontrols2-6 libqt6opengl6-dev + - name: Configure MSVC + uses: ilammy/msvc-dev-cmd@v1.12.1 + with: + arch: x64 + spectre: true + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: 6.6.0 + cache: true + modules: 'qtscxml qt5compat qtshadertools qtimageformats qtwebsockets' - name: run qmake - run: qmake6 -makefile -o src/Makefile src/ArdorQuery.pro + run: qmake -makefile -o src/Makefile src/ArdorQuery.pro - name: run make - run: make -C src - - name: copy executable - run: mkdir -p scripts/deb/source/usr/bin/ && cp src/ArdorQuery scripts/deb/source/usr/bin/ArdorQuery - - name: build deb - run: dpkg-deb -b scripts/deb/source ardorquery_amd64.deb - - uses: actions/upload-artifact@v3 - with: - path: ardorquery_amd64.deb - + run: make /F src/Makefile From b2d10c57e30da0fd0205e8a0c50ec6f790ec5290 Mon Sep 17 00:00:00 2001 From: Roman Vladimirov Date: Wed, 27 Dec 2023 21:46:43 +0300 Subject: [PATCH 2/4] Update deb-package.yml --- .github/workflows/deb-package.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-package.yml b/.github/workflows/deb-package.yml index d68142b..049a267 100644 --- a/.github/workflows/deb-package.yml +++ b/.github/workflows/deb-package.yml @@ -20,9 +20,8 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: 6.6.0 - cache: true - modules: 'qtscxml qt5compat qtshadertools qtimageformats qtwebsockets' + modules: qtscxml qt5compat qtimageformats qtwebsockets - name: run qmake run: qmake -makefile -o src/Makefile src/ArdorQuery.pro - name: run make - run: make /F src/Makefile + run: cd src && make /F Makefile From 4e284fd9f43b799dfa1159523c88ba14f1c001b4 Mon Sep 17 00:00:00 2001 From: Roman Vladimirov Date: Wed, 27 Dec 2023 21:48:58 +0300 Subject: [PATCH 3/4] Update deb-package.yml --- .github/workflows/deb-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deb-package.yml b/.github/workflows/deb-package.yml index 049a267..d01d948 100644 --- a/.github/workflows/deb-package.yml +++ b/.github/workflows/deb-package.yml @@ -24,4 +24,4 @@ jobs: - name: run qmake run: qmake -makefile -o src/Makefile src/ArdorQuery.pro - name: run make - run: cd src && make /F Makefile + run: cd src && nmake /F Makefile From 7c48cda4ec64eb50b3e1598a533312565978b400 Mon Sep 17 00:00:00 2001 From: Roman Vladimirov Date: Wed, 27 Dec 2023 22:07:44 +0300 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4e9f0b..e487d4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,24 @@ jobs: run: qmake6 -makefile -o src/Makefile src/ArdorQuery.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" - name: run make run: make -C src + windowsbuild: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - name: Configure MSVC + uses: ilammy/msvc-dev-cmd@v1.12.1 + with: + arch: x64 + spectre: true + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: 6.6.0 + modules: qtscxml qt5compat qtimageformats qtwebsockets + - name: run qmake + run: qmake -makefile -o src/Makefile src/ArdorQuery.pro + - name: run make + run: cd src && nmake /F Makefile publishdocs: runs-on: ubuntu-latest steps: