From 80ce8347f67d52c4d4aecf5dd354cac4c3c9de16 Mon Sep 17 00:00:00 2001 From: pokamest Date: Wed, 2 Nov 2022 22:40:01 +0300 Subject: [PATCH 01/23] GH actions 1 --- client/3rd/qtkeychain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/3rd/qtkeychain b/client/3rd/qtkeychain index f197cdb9..c6f0b663 160000 --- a/client/3rd/qtkeychain +++ b/client/3rd/qtkeychain @@ -1 +1 @@ -Subproject commit f197cdb935b0cfd9881fdc6860874cb8379d1238 +Subproject commit c6f0b66318f8da6917fb4681103f7303b1836194 From 3d1b37dc855717adee6c3a4de22c6be4bee6e937 Mon Sep 17 00:00:00 2001 From: pokamest Date: Wed, 2 Nov 2022 22:47:16 +0300 Subject: [PATCH 02/23] gh actions 2 --- .github/workflows/deploy.yml | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..d8067508 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,38 @@ +name: Deploy workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: [push, pull_request] + + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + Build-Bundle-Action: + name: Build-Bundle-Action + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + with: + fetch-depth: 10 + + - name: Install packages + run: sudo apt-get install sshpass p7zip p7zip-full python3 python3-pip libgl-dev mesa-common-dev libpulse-dev libxcb-* libxkbcommon-x11-0 + + - name: Install deps and build project + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.4 + QT_BIN_DIR: $HOME/Qt/$QT_VERSION/gcc_64/bin + QIF_BIN_DIR: $QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin + + run: | + if [ ! -f $QT_BIN_DIR/qmake ]; then \ + python3 -m pip install --user $(whoami) --upgrade pip && \ + export PATH=$HOME/.local/bin:$PATH && \ + python3 -m pip install -U aqtinstall requests py7zr && \ + python3 -m pip show aqtinstall && \ + python3 -m aqt install-qt linux desktop $QT_VERSION gcc_64 -m all -O $HOME/Qt && \ + python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \ + fi && \ + bash deploy.sh + From 9ef5d0c1441c7f880ad58f061a26cb99d478db2c Mon Sep 17 00:00:00 2001 From: pokamest Date: Wed, 2 Nov 2022 23:06:19 +0300 Subject: [PATCH 03/23] GH actions 3 --- .github/workflows/deploy.yml | 39 +++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d8067508..13bc2ce8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,24 +7,27 @@ on: [push, pull_request] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - Build-Bundle-Action: - name: Build-Bundle-Action + Build-Linux-Ubuntu: + name: Build-Linux-Ubuntu runs-on: ubuntu-latest + + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.4 + QT_BIN_DIR: $HOME/Qt/$QT_VERSION/gcc_64/bin + QIF_BIN_DIR: $QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin + steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: fetch-depth: 10 - - name: Install packages - run: sudo apt-get install sshpass p7zip p7zip-full python3 python3-pip libgl-dev mesa-common-dev libpulse-dev libxcb-* libxkbcommon-x11-0 - - - name: Install deps and build project - env: - QT_VERSION: 5.15.2 - QIF_VERSION: 4.4 - QT_BIN_DIR: $HOME/Qt/$QT_VERSION/gcc_64/bin - QIF_BIN_DIR: $QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin + - uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: p7zip p7zip-full python3 python3-pip libgl-dev mesa-common-dev libpulse-dev libxcb-* libxkbcommon-x11-0 + version: 1.0 + - name: Install Qt run: | if [ ! -f $QT_BIN_DIR/qmake ]; then \ python3 -m pip install --user $(whoami) --upgrade pip && \ @@ -33,6 +36,14 @@ jobs: python3 -m pip show aqtinstall && \ python3 -m aqt install-qt linux desktop $QT_VERSION gcc_64 -m all -O $HOME/Qt && \ python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \ - fi && \ - bash deploy.sh + fi + + - name: Cache Qt + uses: actions/cache@v2 + id: cache-qt + with: + path: "$HOME/Qt" + + - name: Build project + run: bash deploy/build_linux.sh From 3af9bf9e123d8d6deef84d651684db9496c4d583 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:04:08 +0300 Subject: [PATCH 04/23] GH actions 3 --- .github/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 13bc2ce8..7cfd8492 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,8 +39,10 @@ jobs: fi - name: Cache Qt - uses: actions/cache@v2 + uses: actions/cache@v3 id: cache-qt + key: + qt-5.15.2-linux with: path: "$HOME/Qt" From c1fddd716490be42c251b5e6d0495a0f68822607 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:16:23 +0300 Subject: [PATCH 05/23] GH actions 4 --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7cfd8492..0561d096 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,8 +41,7 @@ jobs: - name: Cache Qt uses: actions/cache@v3 id: cache-qt - key: - qt-5.15.2-linux + key: qt-5.15.2-linux with: path: "$HOME/Qt" From 375b3d776c951206361b0a6447529e1d83c7c540 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:18:50 +0300 Subject: [PATCH 06/23] GH actions 5 --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0561d096..8e304f30 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,8 +41,8 @@ jobs: - name: Cache Qt uses: actions/cache@v3 id: cache-qt - key: qt-5.15.2-linux with: + key: qt-5.15.2-linux path: "$HOME/Qt" - name: Build project From b685e7008e532127ef85993e7d40d66dacfc12e9 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:30:31 +0300 Subject: [PATCH 07/23] GH actions 6 --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8e304f30..5ffcfec4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,8 +14,8 @@ jobs: env: QT_VERSION: 5.15.2 QIF_VERSION: 4.4 - QT_BIN_DIR: $HOME/Qt/$QT_VERSION/gcc_64/bin - QIF_BIN_DIR: $QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin + QT_BIN_DIR: ~/Qt/${{env.QT_VERSION}}/gcc_64/bin + QIF_BIN_DIR: ${{env.QT_BIN_DIR}}/../../../Tools/QtInstallerFramework/${{env.QIF_VERSION}}/bin steps: - uses: actions/checkout@v3 From 64de64ce33619973911fd6b23460321cebdc21d6 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:32:26 +0300 Subject: [PATCH 08/23] GH actions 7 --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5ffcfec4..798482eb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,8 +14,8 @@ jobs: env: QT_VERSION: 5.15.2 QIF_VERSION: 4.4 - QT_BIN_DIR: ~/Qt/${{env.QT_VERSION}}/gcc_64/bin - QIF_BIN_DIR: ${{env.QT_BIN_DIR}}/../../../Tools/QtInstallerFramework/${{env.QIF_VERSION}}/bin + QT_BIN_DIR: ~/Qt/${{ env.QT_VERSION }}/gcc_64/bin + QIF_BIN_DIR: ${{ env.QT_BIN_DIR }}/../../../Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin steps: - uses: actions/checkout@v3 From 91baaed96dbca2e0c9703e821ccc6882d6666507 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:52:51 +0300 Subject: [PATCH 09/23] GH actions 8 --- .github/workflows/deploy.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 798482eb..66bc011e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,8 +14,12 @@ jobs: env: QT_VERSION: 5.15.2 QIF_VERSION: 4.4 - QT_BIN_DIR: ~/Qt/${{ env.QT_VERSION }}/gcc_64/bin - QIF_BIN_DIR: ${{ env.QT_BIN_DIR }}/../../../Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin + + steps: + - name: Setup env + - run: | + QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin && export QT_BIN_DIR && \ + QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin && export QIF_BIN_DIR steps: - uses: actions/checkout@v3 From f09020c3bc3b7c1778c204769d7e45bb4865e025 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:54:04 +0300 Subject: [PATCH 10/23] GH actions 9 --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 66bc011e..b40ed76a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,7 +21,6 @@ jobs: QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin && export QT_BIN_DIR && \ QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin && export QIF_BIN_DIR - steps: - uses: actions/checkout@v3 with: fetch-depth: 10 From ec65e2025e4fdbdcf24530977bf6910fb268241a Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 3 Nov 2022 00:56:22 +0300 Subject: [PATCH 11/23] GH actions 10 --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b40ed76a..34e42069 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Setup env - - run: | + run: | QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin && export QT_BIN_DIR && \ QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin && export QIF_BIN_DIR From 60e25d9c6752d69e02c2af84a5c0896220da3316 Mon Sep 17 00:00:00 2001 From: pokamest Date: Sat, 5 Nov 2022 18:41:19 +0300 Subject: [PATCH 12/23] GH actions 11 --- .github/workflows/deploy.yml | 106 +++++++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 34e42069..54c2ca4b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,10 +16,27 @@ jobs: QIF_VERSION: 4.4 steps: - - name: Setup env - run: | - QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin && export QT_BIN_DIR && \ - QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin && export QIF_BIN_DIR + - name: Install Qt + uses: jurplel/install-qt-action@v3 + host: linux + with: + version: '5.15.2' + host: 'linux' + target: 'desktop' + arch: 'gcc_64' + dir: '${{ github.workspace }}/Qt/' + install-deps: 'true' + modules: 'qtcharts' + archives: 'qtbase qtsvg' + cache: 'true' + cache-key-prefix: 'install-qt-action-linux' + setup-python: 'true' + tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + set-env: 'true' + tools-only: 'false' + aqtversion: '==2.1.*' + py7zrversion: '==0.19.*' + extra: '--external 7z' - uses: actions/checkout@v3 with: @@ -51,3 +68,84 @@ jobs: - name: Build project run: bash deploy/build_linux.sh + + + Build-Windows-x64: + name: Build-Windows-x64 + runs-on: ubuntu-latest + + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.4 + + steps: + - name: Install Qt + uses: jurplel/install-qt-action@v3 + host: windows + with: + version: '5.15.2' + host: 'windows' + target: 'desktop' + arch: 'win64_msvc2019_64' + dir: '${{ github.workspace }}/Qt/' + install-deps: 'true' + modules: 'qtcharts' + archives: 'qtbase qtsvg' + cache: 'false' + cache-key-prefix: 'install-qt-action-windows64' + setup-python: 'true' + tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + set-env: 'true' + tools-only: 'false' + aqtversion: '==2.1.*' + py7zrversion: '==0.19.*' + extra: '--external 7z' + + + - uses: actions/checkout@v3 + with: + fetch-depth: 10 + + - name: Build project + run: cmd //c winbuild.bat + + + + Build-MacOS: + name: Build-MacOS + runs-on: ubuntu-latest + + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.4 + + steps: + - name: Install Qt + uses: jurplel/install-qt-action@v3 + host: windows + with: + version: '5.15.2' + host: 'mac' + target: 'desktop' + arch: 'clang_64' + dir: '${{ github.workspace }}/Qt/' + install-deps: 'true' + modules: 'qtcharts' + archives: 'qtbase qtsvg' + cache: 'true' + cache-key-prefix: 'install-qt-action-mac' + setup-python: 'true' + tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + set-env: 'true' + tools-only: 'false' + aqtversion: '==2.1.*' + py7zrversion: '==0.19.*' + extra: '--external 7z' + + - uses: actions/checkout@v3 + with: + fetch-depth: 10 + + - name: Build project + run: bash deploy/build_macos.sh + From 3296cd6c3999adc42a70e46bd57a2f72b313600a Mon Sep 17 00:00:00 2001 From: pokamest Date: Sat, 5 Nov 2022 18:43:11 +0300 Subject: [PATCH 13/23] GH actions 12 --- .github/workflows/deploy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 54c2ca4b..3a54a0ee 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,6 @@ jobs: steps: - name: Install Qt uses: jurplel/install-qt-action@v3 - host: linux with: version: '5.15.2' host: 'linux' @@ -81,7 +80,6 @@ jobs: steps: - name: Install Qt uses: jurplel/install-qt-action@v3 - host: windows with: version: '5.15.2' host: 'windows' @@ -122,7 +120,6 @@ jobs: steps: - name: Install Qt uses: jurplel/install-qt-action@v3 - host: windows with: version: '5.15.2' host: 'mac' From eeed6c3474c53e19b43ba5d9d9ed57ce5952f4e2 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 20 Nov 2022 21:28:30 +0300 Subject: [PATCH 14/23] chore/revert link to dev qtkeychain submodule --- client/3rd/qtkeychain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/3rd/qtkeychain b/client/3rd/qtkeychain index c6f0b663..f197cdb9 160000 --- a/client/3rd/qtkeychain +++ b/client/3rd/qtkeychain @@ -1 +1 @@ -Subproject commit c6f0b66318f8da6917fb4681103f7303b1836194 +Subproject commit f197cdb935b0cfd9881fdc6860874cb8379d1238 From 409386336d1fde833bc58de18409b5fec7e37589 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 20 Nov 2022 21:50:54 +0300 Subject: [PATCH 15/23] for github actions added steps to build x32/x64 windows application --- .github/workflows/deploy.yml | 246 +++++++++++++++++++---------------- 1 file changed, 136 insertions(+), 110 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3a54a0ee..d0b3df04 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,147 +2,173 @@ name: Deploy workflow # Controls when the action will run. Workflow runs when manually triggered using the UI # or API. -on: [push, pull_request] +on: [push] #, pull_request] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - Build-Linux-Ubuntu: - name: Build-Linux-Ubuntu - runs-on: ubuntu-latest + # Build-Linux-Ubuntu: + # name: Build-Linux-Ubuntu + # runs-on: ubuntu-latest - env: - QT_VERSION: 5.15.2 - QIF_VERSION: 4.4 + # env: + # QT_VERSION: 5.15.2 + # QIF_VERSION: 4.4 - steps: - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: '5.15.2' - host: 'linux' - target: 'desktop' - arch: 'gcc_64' - dir: '${{ github.workspace }}/Qt/' - install-deps: 'true' - modules: 'qtcharts' - archives: 'qtbase qtsvg' - cache: 'true' - cache-key-prefix: 'install-qt-action-linux' - setup-python: 'true' - tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' - set-env: 'true' - tools-only: 'false' - aqtversion: '==2.1.*' - py7zrversion: '==0.19.*' - extra: '--external 7z' + # steps: + # - name: Install Qt + # uses: jurplel/install-qt-action@v3 + # with: + # version: '5.15.2' + # host: 'linux' + # target: 'desktop' + # arch: 'gcc_64' + # dir: '${{ github.workspace }}/Qt/' + # install-deps: 'true' + # modules: 'qtcharts' + # archives: 'qtbase qtsvg' + # cache: 'true' + # cache-key-prefix: 'install-qt-action-linux' + # setup-python: 'true' + # tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + # set-env: 'true' + # tools-only: 'false' + # aqtversion: '==2.1.*' + # py7zrversion: '==0.19.*' + # extra: '--external 7z' - - uses: actions/checkout@v3 - with: - fetch-depth: 10 + # - uses: actions/checkout@v3 + # with: + # fetch-depth: 10 - - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: p7zip p7zip-full python3 python3-pip libgl-dev mesa-common-dev libpulse-dev libxcb-* libxkbcommon-x11-0 - version: 1.0 + # - uses: awalsh128/cache-apt-pkgs-action@latest + # with: + # packages: p7zip p7zip-full python3 python3-pip libgl-dev mesa-common-dev libpulse-dev libxcb-* libxkbcommon-x11-0 + # version: 1.0 - - name: Install Qt - run: | - if [ ! -f $QT_BIN_DIR/qmake ]; then \ - python3 -m pip install --user $(whoami) --upgrade pip && \ - export PATH=$HOME/.local/bin:$PATH && \ - python3 -m pip install -U aqtinstall requests py7zr && \ - python3 -m pip show aqtinstall && \ - python3 -m aqt install-qt linux desktop $QT_VERSION gcc_64 -m all -O $HOME/Qt && \ - python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \ - fi + # - name: Install Qt + # run: | + # if [ ! -f $QT_BIN_DIR/qmake ]; then \ + # python3 -m pip install --user $(whoami) --upgrade pip && \ + # export PATH=$HOME/.local/bin:$PATH && \ + # python3 -m pip install -U aqtinstall requests py7zr && \ + # python3 -m pip show aqtinstall && \ + # python3 -m aqt install-qt linux desktop $QT_VERSION gcc_64 -m all -O $HOME/Qt && \ + # python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \ + # fi - - name: Cache Qt - uses: actions/cache@v3 - id: cache-qt - with: - key: qt-5.15.2-linux - path: "$HOME/Qt" + # - name: Cache Qt + # uses: actions/cache@v3 + # id: cache-qt + # with: + # key: qt-5.15.2-linux + # path: "$HOME/Qt" - - name: Build project - run: bash deploy/build_linux.sh + # - name: Build project + # run: bash deploy/build_linux.sh - Build-Windows-x64: - name: Build-Windows-x64 - runs-on: ubuntu-latest + Build-Windows: + name: Build-Windows + runs-on: windows-latest + continue-on-error: true + + strategy: + matrix: + arch: [32, 64] + include: + - qt-arch: 'win32_msvc2019' + arch: 32 + - qt-msvc-path: 'msvc2019' + arch: 32 + - msvc-arch: 'x86' + arch: 32 + - qt-arch: 'win64_msvc2019_64' + arch: 64 + - qt-msvc-path: 'msvc2019_64' + arch: 64 + - msvc-arch: 'x64' + arch: 64 env: QT_VERSION: 5.15.2 - QIF_VERSION: 4.4 + QIF_VERSION: 4.5 + BUILD_ARCH: ${{ matrix.arch }} steps: - - name: Install Qt + - name: 'Get sources' + uses: actions/checkout@v3 + with: + submodules: 'true' + fetch-depth: 10 + + - name: 'Install Qt' uses: jurplel/install-qt-action@v3 with: - version: '5.15.2' + version: ${{ env.QT_VERSION }} host: 'windows' target: 'desktop' - arch: 'win64_msvc2019_64' - dir: '${{ github.workspace }}/Qt/' - install-deps: 'true' - modules: 'qtcharts' - archives: 'qtbase qtsvg' - cache: 'false' - cache-key-prefix: 'install-qt-action-windows64' + arch: '${{ matrix.qt-arch }}' + dir: ${{ runner.temp }} setup-python: 'true' - tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + tools: 'tools_ifw' set-env: 'true' - tools-only: 'false' - aqtversion: '==2.1.*' - py7zrversion: '==0.19.*' extra: '--external 7z' - - - uses: actions/checkout@v3 + - name: 'Setup mvsc' + uses: ilammy/msvc-dev-cmd@v1 with: - fetch-depth: 10 + arch: ${{ matrix.msvc-arch }} - - name: Build project - run: cmd //c winbuild.bat + - name: 'Build project' + shell: cmd + run: | + set BUILD_ARCH=${{ env.BUILD_ARCH }} + set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\${{ matrix.qt-msvc-path }}\\bin" + set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin" + call deploy\\build_windows.bat - - - Build-MacOS: - name: Build-MacOS - runs-on: ubuntu-latest - - env: - QT_VERSION: 5.15.2 - QIF_VERSION: 4.4 - - steps: - - name: Install Qt - uses: jurplel/install-qt-action@v3 + - name: 'Upload artifact' + uses: actions/upload-artifact@v3 with: - version: '5.15.2' - host: 'mac' - target: 'desktop' - arch: 'clang_64' - dir: '${{ github.workspace }}/Qt/' - install-deps: 'true' - modules: 'qtcharts' - archives: 'qtbase qtsvg' - cache: 'true' - cache-key-prefix: 'install-qt-action-mac' - setup-python: 'true' - tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' - set-env: 'true' - tools-only: 'false' - aqtversion: '==2.1.*' - py7zrversion: '==0.19.*' - extra: '--external 7z' + name: AmneziaVPN_x${{ env.BUILD_ARCH }} + path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe - - uses: actions/checkout@v3 - with: - fetch-depth: 10 + # Build-MacOS: + # name: Build-MacOS + # runs-on: ubuntu-latest - - name: Build project - run: bash deploy/build_macos.sh + # env: + # QT_VERSION: 5.15.2 + # QIF_VERSION: 4.4 + + # steps: + # - name: Install Qt + # uses: jurplel/install-qt-action@v3 + # with: + # version: '5.15.2' + # host: 'mac' + # target: 'desktop' + # arch: 'clang_64' + # dir: '${{ github.workspace }}/Qt/' + # install-deps: 'true' + # modules: 'qtcharts' + # archives: 'qtbase qtsvg' + # cache: 'true' + # cache-key-prefix: 'install-qt-action-mac' + # setup-python: 'true' + # tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + # set-env: 'true' + # tools-only: 'false' + # aqtversion: '==2.1.*' + # py7zrversion: '==0.19.*' + # extra: '--external 7z' + + # - uses: actions/checkout@v3 + # with: + # fetch-depth: 10 + + # - name: Build project + # run: bash deploy/build_macos.sh From ca158def311db6a50c0f4a32e1c551d48ce4721c Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Wed, 23 Nov 2022 00:25:07 +0300 Subject: [PATCH 16/23] temporarily turned off the deployment of artifacts --- .github/workflows/deploy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d0b3df04..c775ac11 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -129,11 +129,11 @@ jobs: set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin" call deploy\\build_windows.bat - - name: 'Upload artifact' - uses: actions/upload-artifact@v3 - with: - name: AmneziaVPN_x${{ env.BUILD_ARCH }} - path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe + # - name: 'Upload artifact' + # uses: actions/upload-artifact@v3 + # with: + # name: AmneziaVPN_x${{ env.BUILD_ARCH }} + # path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe # Build-MacOS: # name: Build-MacOS From dfe927dcbd9e71c8baa49c684232243385d12e08 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Wed, 23 Nov 2022 17:26:29 +0300 Subject: [PATCH 17/23] for github actions added step to build ios application --- .github/workflows/deploy.yml | 53 +++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c775ac11..54b96136 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -67,7 +67,7 @@ jobs: # - name: Build project # run: bash deploy/build_linux.sh - +# ------------------------------------------------------ Build-Windows: name: Build-Windows @@ -135,6 +135,57 @@ jobs: # name: AmneziaVPN_x${{ env.BUILD_ARCH }} # path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe +# ------------------------------------------------------ + + Build-IOS: + name: Build-IOS + runs-on: macos-latest + + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.4 + + steps: + - name: Setup xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '13.4' + + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'mac' + target: 'ios' + dir: ${{ runner.temp }} + setup-python: 'true' + set-env: 'true' + extra: '--external 7z' + + - name: Install go + uses: actions/setup-go@v3 + + - name: Setup gomobile + run: | + export PATH=$PATH:~/go/bin + go install golang.org/x/mobile/cmd/gomobile@latest + gomobile init + + - name: 'Get sources' + uses: actions/checkout@v3 + with: + submodules: 'true' + fetch-depth: 10 + + - name: Build project + run: | + export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin" + export QT_IOS_BIN=$QT_BIN_DIR + export PATH=$PATH:~/go/bin + bash deploy/build_ios.sh + +# ------------------------------------------------------ + # Build-MacOS: # name: Build-MacOS # runs-on: ubuntu-latest From 48734689d8ea0e8e8893061b1aac15ed7c7d18b6 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Fri, 25 Nov 2022 00:52:08 +0300 Subject: [PATCH 18/23] for github actions added step to build macos and linux application --- .github/workflows/deploy.yml | 168 +++++++++++++++++------------------ 1 file changed, 81 insertions(+), 87 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 54b96136..12a28046 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,75 +4,58 @@ name: Deploy workflow # or API. on: [push] #, pull_request] - # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # Build-Linux-Ubuntu: - # name: Build-Linux-Ubuntu - # runs-on: ubuntu-latest + Build-Linux-Ubuntu: + name: Build-Linux-Ubuntu + runs-on: ubuntu-latest - # env: - # QT_VERSION: 5.15.2 - # QIF_VERSION: 4.4 + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.5 - # steps: - # - name: Install Qt - # uses: jurplel/install-qt-action@v3 - # with: - # version: '5.15.2' - # host: 'linux' - # target: 'desktop' - # arch: 'gcc_64' - # dir: '${{ github.workspace }}/Qt/' - # install-deps: 'true' - # modules: 'qtcharts' - # archives: 'qtbase qtsvg' - # cache: 'true' - # cache-key-prefix: 'install-qt-action-linux' - # setup-python: 'true' - # tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' - # set-env: 'true' - # tools-only: 'false' - # aqtversion: '==2.1.*' - # py7zrversion: '==0.19.*' - # extra: '--external 7z' + steps: + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'linux' + target: 'desktop' + arch: 'gcc_64' + dir: ${{ runner.temp }} + setup-python: 'true' + tools: 'tools_ifw' + set-env: 'true' + extra: '--external 7z' - # - uses: actions/checkout@v3 - # with: - # fetch-depth: 10 - - # - uses: awalsh128/cache-apt-pkgs-action@latest - # with: - # packages: p7zip p7zip-full python3 python3-pip libgl-dev mesa-common-dev libpulse-dev libxcb-* libxkbcommon-x11-0 - # version: 1.0 + - name: 'Get sources' + uses: actions/checkout@v3 + with: + submodules: 'true' + fetch-depth: 10 - # - name: Install Qt - # run: | - # if [ ! -f $QT_BIN_DIR/qmake ]; then \ - # python3 -m pip install --user $(whoami) --upgrade pip && \ - # export PATH=$HOME/.local/bin:$PATH && \ - # python3 -m pip install -U aqtinstall requests py7zr && \ - # python3 -m pip show aqtinstall && \ - # python3 -m aqt install-qt linux desktop $QT_VERSION gcc_64 -m all -O $HOME/Qt && \ - # python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \ - # fi + # - name: Cache Qt + # uses: actions/cache@v3 + # id: cache-qt + # with: + # key: qt-5.15.2-linux + # path: "$HOME/Qt" - # - name: Cache Qt - # uses: actions/cache@v3 - # id: cache-qt - # with: - # key: qt-5.15.2-linux - # path: "$HOME/Qt" + - name: 'Setup ccache' + uses: hendrikmuhs/ccache-action@v1.2 - # - name: Build project - # run: bash deploy/build_linux.sh + - name: Build project + run: | + export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin + export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin + bash deploy/build_linux.sh # ------------------------------------------------------ Build-Windows: name: Build-Windows runs-on: windows-latest - continue-on-error: true + # continue-on-error: true strategy: matrix: @@ -103,6 +86,9 @@ jobs: submodules: 'true' fetch-depth: 10 + - name: 'Setup ccache' + uses: hendrikmuhs/ccache-action@v1.2 + - name: 'Install Qt' uses: jurplel/install-qt-action@v3 with: @@ -177,6 +163,9 @@ jobs: submodules: 'true' fetch-depth: 10 + - name: 'Setup ccache' + uses: hendrikmuhs/ccache-action@v1.2 + - name: Build project run: | export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin" @@ -186,40 +175,45 @@ jobs: # ------------------------------------------------------ - # Build-MacOS: - # name: Build-MacOS - # runs-on: ubuntu-latest + Build-MacOS: + name: Build-MacOS + runs-on: macos-latest - # env: - # QT_VERSION: 5.15.2 - # QIF_VERSION: 4.4 + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.5 - # steps: - # - name: Install Qt - # uses: jurplel/install-qt-action@v3 - # with: - # version: '5.15.2' - # host: 'mac' - # target: 'desktop' - # arch: 'clang_64' - # dir: '${{ github.workspace }}/Qt/' - # install-deps: 'true' - # modules: 'qtcharts' - # archives: 'qtbase qtsvg' - # cache: 'true' - # cache-key-prefix: 'install-qt-action-mac' - # setup-python: 'true' - # tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' - # set-env: 'true' - # tools-only: 'false' - # aqtversion: '==2.1.*' - # py7zrversion: '==0.19.*' - # extra: '--external 7z' + steps: + - name: Setup xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '13.4' - # - uses: actions/checkout@v3 - # with: - # fetch-depth: 10 + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'mac' + target: 'desktop' + arch: 'clang_64' + dir: ${{ runner.temp }} + setup-python: 'true' + tools: 'tools_ifw' + set-env: 'true' + extra: '--external 7z' - # - name: Build project - # run: bash deploy/build_macos.sh + - name: 'Get sources' + uses: actions/checkout@v3 + with: + submodules: 'true' + fetch-depth: 10 + + - name: 'Setup ccache' + uses: hendrikmuhs/ccache-action@v1.2 + + - name: Build project + run: | + export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/clang_64/bin" + export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin" + bash deploy/build_macos.sh From 0a398660456eb39346c9f29cf7aa0dd884d95c77 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Fri, 25 Nov 2022 22:34:01 +0300 Subject: [PATCH 19/23] for github actions added step to build android application --- .github/workflows/deploy.yml | 101 ++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 32 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 12a28046..e04520c8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,13 +1,10 @@ -name: Deploy workflow +name: 'Deploy workflow' -# Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. -on: [push] #, pull_request] +on: [push] -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: Build-Linux-Ubuntu: - name: Build-Linux-Ubuntu + name: 'Build-Linux-Ubuntu' runs-on: ubuntu-latest env: @@ -15,7 +12,7 @@ jobs: QIF_VERSION: 4.5 steps: - - name: Install Qt + - name: 'Install Qt' uses: jurplel/install-qt-action@v3 with: version: ${{ env.QT_VERSION }} @@ -34,17 +31,10 @@ jobs: submodules: 'true' fetch-depth: 10 - # - name: Cache Qt - # uses: actions/cache@v3 - # id: cache-qt - # with: - # key: qt-5.15.2-linux - # path: "$HOME/Qt" - - name: 'Setup ccache' uses: hendrikmuhs/ccache-action@v1.2 - - name: Build project + - name: 'Build project' run: | export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin @@ -55,7 +45,7 @@ jobs: Build-Windows: name: Build-Windows runs-on: windows-latest - # continue-on-error: true + continue-on-error: true strategy: matrix: @@ -115,16 +105,10 @@ jobs: set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin" call deploy\\build_windows.bat - # - name: 'Upload artifact' - # uses: actions/upload-artifact@v3 - # with: - # name: AmneziaVPN_x${{ env.BUILD_ARCH }} - # path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe - # ------------------------------------------------------ Build-IOS: - name: Build-IOS + name: 'Build-IOS' runs-on: macos-latest env: @@ -132,12 +116,12 @@ jobs: QIF_VERSION: 4.4 steps: - - name: Setup xcode + - name: 'Setup xcode' uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '13.4' - - name: Install Qt + - name: 'Install Qt' uses: jurplel/install-qt-action@v3 with: version: ${{ env.QT_VERSION }} @@ -148,10 +132,10 @@ jobs: set-env: 'true' extra: '--external 7z' - - name: Install go + - name: 'Install go' uses: actions/setup-go@v3 - - name: Setup gomobile + - name: 'Setup gomobile' run: | export PATH=$PATH:~/go/bin go install golang.org/x/mobile/cmd/gomobile@latest @@ -166,7 +150,7 @@ jobs: - name: 'Setup ccache' uses: hendrikmuhs/ccache-action@v1.2 - - name: Build project + - name: 'Build project' run: | export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin" export QT_IOS_BIN=$QT_BIN_DIR @@ -176,7 +160,7 @@ jobs: # ------------------------------------------------------ Build-MacOS: - name: Build-MacOS + name: 'Build-MacOS' runs-on: macos-latest env: @@ -184,12 +168,12 @@ jobs: QIF_VERSION: 4.5 steps: - - name: Setup xcode + - name: 'Setup xcode' uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '13.4' - - name: Install Qt + - name: 'Install Qt' uses: jurplel/install-qt-action@v3 with: version: ${{ env.QT_VERSION }} @@ -211,9 +195,62 @@ jobs: - name: 'Setup ccache' uses: hendrikmuhs/ccache-action@v1.2 - - name: Build project + - name: 'Build project' run: | export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/clang_64/bin" export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin" bash deploy/build_macos.sh +# ------------------------------------------------------ + + Build-Android: + name: 'Build-Android' + runs-on: ubuntu-latest + + env: + QT_VERSION: 5.15.2 + QIF_VERSION: 4.5 + + steps: + - name: 'Install Qt' + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'linux' + target: 'android' + arch: 'android' + modules: 'qtcharts qtdatavis3d qtpurchasing qtnetworkauth qtscript' + dir: ${{ runner.temp }} + setup-python: 'true' + set-env: 'true' + extra: '--external 7z' + + - name: 'Get sources' + uses: actions/checkout@v3 + with: + submodules: 'true' + fetch-depth: 10 + + - name: 'Setup ccache' + uses: hendrikmuhs/ccache-action@v1.2 + + - name: 'Setup Java' + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '8' + + - name: 'Build project' + run: | + export NDK_VERSION=21d + export ANDROID_NDK_PLATFORM=android-21 + export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION} + export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME + + if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then + wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux-x86_64.zip -qO ${{ runner.temp }}/ndk.zip && + unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; + fi + + export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android/bin + bash deploy/build_android.sh \ No newline at end of file From 813dced6df4ef05c25bac74a8c0ea712f02c16f9 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 27 Nov 2022 01:30:36 +0300 Subject: [PATCH 20/23] added qt6 modules installation to github actions --- .github/workflows/deploy.yml | 15 +++++++-------- deploy/build_ios.sh | 4 ++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e04520c8..15674b32 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,6 +19,7 @@ jobs: host: 'linux' target: 'desktop' arch: 'gcc_64' + modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' tools: 'tools_ifw' @@ -49,14 +50,8 @@ jobs: strategy: matrix: - arch: [32, 64] + arch: [64] include: - - qt-arch: 'win32_msvc2019' - arch: 32 - - qt-msvc-path: 'msvc2019' - arch: 32 - - msvc-arch: 'x86' - arch: 32 - qt-arch: 'win64_msvc2019_64' arch: 64 - qt-msvc-path: 'msvc2019_64' @@ -86,6 +81,7 @@ jobs: host: 'windows' target: 'desktop' arch: '${{ matrix.qt-arch }}' + modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' tools: 'tools_ifw' @@ -127,10 +123,12 @@ jobs: version: ${{ env.QT_VERSION }} host: 'mac' target: 'ios' + modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' set-env: 'true' extra: '--external 7z' + aqtversion: '==3.0.*' - name: 'Install go' uses: actions/setup-go@v3 @@ -180,6 +178,7 @@ jobs: host: 'mac' target: 'desktop' arch: 'clang_64' + modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' tools: 'tools_ifw' @@ -219,7 +218,7 @@ jobs: host: 'linux' target: 'android' arch: 'android' - modules: 'qtcharts qtdatavis3d qtpurchasing qtnetworkauth qtscript' + modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' set-env: 'true' diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh index 994a96ed..793facbe 100644 --- a/deploy/build_ios.sh +++ b/deploy/build_ios.sh @@ -1,6 +1,10 @@ #!/bin/bash echo "Build script started ..." +ls "/Users/runner/work/_temp/Qt/6.4.0/" +# sed 's/macos/ios/' /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake > /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake +cat /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake + set -o errexit -o nounset # Hold on to current directory From 8b6afcc5ecfc470dba7fbe4c99ff35ff8151091d Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 27 Nov 2022 01:35:13 +0300 Subject: [PATCH 21/23] removed unused qzxing folder --- client/3rd/qzxing | 1 - 1 file changed, 1 deletion(-) delete mode 160000 client/3rd/qzxing diff --git a/client/3rd/qzxing b/client/3rd/qzxing deleted file mode 160000 index 2fd4dd60..00000000 --- a/client/3rd/qzxing +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2fd4dd60c04a29c6d1271fdd9ae25378b8f61ec8 From c85ad470baab043914dcf5a864038b2079ef9b27 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 27 Nov 2022 01:38:30 +0300 Subject: [PATCH 22/23] qt version in github actions changed to 6.4.1 --- .github/workflows/deploy.yml | 12 ++++++------ deploy/build_macos.sh | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 15674b32..0e500a61 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest env: - QT_VERSION: 5.15.2 + QT_VERSION: 6.4.1 QIF_VERSION: 4.5 steps: @@ -60,7 +60,7 @@ jobs: arch: 64 env: - QT_VERSION: 5.15.2 + QT_VERSION: 6.4.1 QIF_VERSION: 4.5 BUILD_ARCH: ${{ matrix.arch }} @@ -108,7 +108,7 @@ jobs: runs-on: macos-latest env: - QT_VERSION: 5.15.2 + QT_VERSION: 6.4.1 QIF_VERSION: 4.4 steps: @@ -162,7 +162,7 @@ jobs: runs-on: macos-latest env: - QT_VERSION: 5.15.2 + QT_VERSION: 6.4.1 QIF_VERSION: 4.5 steps: @@ -196,7 +196,7 @@ jobs: - name: 'Build project' run: | - export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/clang_64/bin" + export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin" export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin" bash deploy/build_macos.sh @@ -207,7 +207,7 @@ jobs: runs-on: ubuntu-latest env: - QT_VERSION: 5.15.2 + QT_VERSION: 6.4.1 QIF_VERSION: 4.5 steps: diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 09dd85f7..22c2a4dd 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -1,6 +1,8 @@ #!/bin/bash echo "Build script started ..." +ls $QT_BIN_DIR + set -o errexit -o nounset while getopts n: flag From 2e5171c205da945a5f82610f63d5c8540587728b Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 27 Nov 2022 12:32:45 +0300 Subject: [PATCH 23/23] added matrix for all android arch --- .github/workflows/deploy.yml | 58 +++++++++++++++++++++++------------- client/client.pro | 5 +++- deploy/build_android.sh | 1 - deploy/build_ios.sh | 4 --- deploy/build_macos.sh | 2 -- 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0e500a61..d466d6cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,23 +46,11 @@ jobs: Build-Windows: name: Build-Windows runs-on: windows-latest - continue-on-error: true - - strategy: - matrix: - arch: [64] - include: - - qt-arch: 'win64_msvc2019_64' - arch: 64 - - qt-msvc-path: 'msvc2019_64' - arch: 64 - - msvc-arch: 'x64' - arch: 64 env: QT_VERSION: 6.4.1 QIF_VERSION: 4.5 - BUILD_ARCH: ${{ matrix.arch }} + BUILD_ARCH: 64 steps: - name: 'Get sources' @@ -80,7 +68,7 @@ jobs: version: ${{ env.QT_VERSION }} host: 'windows' target: 'desktop' - arch: '${{ matrix.qt-arch }}' + arch: 'win64_msvc2019_64' modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' @@ -91,13 +79,13 @@ jobs: - name: 'Setup mvsc' uses: ilammy/msvc-dev-cmd@v1 with: - arch: ${{ matrix.msvc-arch }} + arch: 'x64' - name: 'Build project' shell: cmd run: | set BUILD_ARCH=${{ env.BUILD_ARCH }} - set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\${{ matrix.qt-msvc-path }}\\bin" + set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\msvc2019_64\\bin" set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin" call deploy\\build_windows.bat @@ -117,7 +105,18 @@ jobs: with: xcode-version: '13.4' - - name: 'Install Qt' + - name: 'Install desktop Qt' + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'mac' + target: 'desktop' + arch: 'clang_64' + modules: 'qtremoteobjects qt5compat' + dir: ${{ runner.temp }} + set-env: 'true' + + - name: 'Install ios Qt' uses: jurplel/install-qt-action@v3 with: version: ${{ env.QT_VERSION }} @@ -128,7 +127,6 @@ jobs: setup-python: 'true' set-env: 'true' extra: '--external 7z' - aqtversion: '==3.0.*' - name: 'Install go' uses: actions/setup-go@v3 @@ -205,19 +203,37 @@ jobs: Build-Android: name: 'Build-Android' runs-on: ubuntu-latest + continue-on-error: true + + strategy: + matrix: + arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a'] env: QT_VERSION: 6.4.1 QIF_VERSION: 4.5 steps: - - name: 'Install Qt' + - name: 'Install desktop Qt' + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT_VERSION }} + host: 'linux' + target: 'desktop' + arch: 'gcc_64' + modules: 'qtremoteobjects qt5compat' + dir: ${{ runner.temp }} + setup-python: 'true' + set-env: 'true' + extra: '--external 7z' + + - name: 'Install android Qt' uses: jurplel/install-qt-action@v3 with: version: ${{ env.QT_VERSION }} host: 'linux' target: 'android' - arch: 'android' + arch: ${{ matrix.arch }} modules: 'qtremoteobjects qt5compat' dir: ${{ runner.temp }} setup-python: 'true' @@ -251,5 +267,5 @@ jobs: unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; fi - export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android/bin + export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin bash deploy/build_android.sh \ No newline at end of file diff --git a/client/client.pro b/client/client.pro index 021cf80b..ab0db693 100644 --- a/client/client.pro +++ b/client/client.pro @@ -8,7 +8,7 @@ TEMPLATE = app IS_CI=$$(CI) !isEmpty(IS_CI){ message("Detected CI env") - CONFIG += silent ccache + CONFIG += silent #ccache } CONFIG += qtquickcompiler @@ -248,6 +248,9 @@ android { # As QAndroidBinder is not yet implemented with a public api QT+=core-private ANDROID_ABIS=ANDROID_TARGET_ARCH + + # for not changing qtkeychain sources for qt6 + QT -= androidextras } else { QT += androidextras diff --git a/deploy/build_android.sh b/deploy/build_android.sh index 75e8c46c..e8799394 100644 --- a/deploy/build_android.sh +++ b/deploy/build_android.sh @@ -36,7 +36,6 @@ echo "Using Qt in $QT_BIN_DIR" echo "Using Android SDK in $ANDROID_SDK_ROOT" echo "Using Android NDK in $ANDROID_NDK_ROOT" - # Checking env $QT_BIN_DIR/qmake -v $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh index 793facbe..994a96ed 100644 --- a/deploy/build_ios.sh +++ b/deploy/build_ios.sh @@ -1,10 +1,6 @@ #!/bin/bash echo "Build script started ..." -ls "/Users/runner/work/_temp/Qt/6.4.0/" -# sed 's/macos/ios/' /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake > /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake -cat /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake - set -o errexit -o nounset # Hold on to current directory diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 22c2a4dd..09dd85f7 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -1,8 +1,6 @@ #!/bin/bash echo "Build script started ..." -ls $QT_BIN_DIR - set -o errexit -o nounset while getopts n: flag