From 5444bb9a7706ee81f115b21a551844c15df393be Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 13:30:48 +0900 Subject: [PATCH 01/17] add --- .github/workflows/build-relase.yml | 75 ++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .github/workflows/build-relase.yml diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml new file mode 100644 index 0000000..8ba39a6 --- /dev/null +++ b/.github/workflows/build-relase.yml @@ -0,0 +1,75 @@ +name: Build and Release + +# on: +# push: +# tags: +# - 'v*' + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + runs-on: windows-latest + + steps: + - name: Checkout repository with submodules + uses: actions/checkout@main + + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + version: '6.5.2' + + - name: Set up Qt6 + run: | + choco install qt6-base-dev + where.exe qmake + shell: powershell + + # - name: Set Qt6 Environment Variables + # run: | + # $qtPath = "${{ env.ProgramFiles(x86) }}\Qt\6.5.0\msvc2019_64\bin" + # echo "QT_PATH=${qtPath}" >> $GITHUB_ENV + # echo "$qtPath" >> $GITHUB_PATH + + - name: Set up MSVC + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + where.exe cl.exe + + - name: Build + run: \ + qmake + nmake + + - name: Create 7Z file + run: | + 7z a cpi-windows.7z cpi.exe LICENSE translations + + # - name: Create release + # id: create_release + # uses: actions/create-release@main + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # tag_name: ${{ github.ref }} + # release_name: Release ${{ github.ref }} + # draft: false + # prerelease: false + + # - name: Upload release asset + # uses: actions/upload-release-asset@main + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: cpi-windows.7z + # asset_name: cpi-windows-${{ github.ref_name }}.7z + # asset_content_type: application/x-7z-compressed From 4434e1cee25f33addaf857537d448acfa3da3310 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 13:46:46 +0900 Subject: [PATCH 02/17] updated --- .github/workflows/build-relase.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 8ba39a6..1193635 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -21,16 +21,17 @@ jobs: - name: Checkout repository with submodules uses: actions/checkout@main - - name: Install Qt - uses: jurplel/install-qt-action@v3 + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 with: - version: '6.5.2' + vs-version: '16.11' - name: Set up Qt6 + shell: powershell run: | choco install qt6-base-dev where.exe qmake - shell: powershell + where.exe cl # - name: Set Qt6 Environment Variables # run: | @@ -38,11 +39,11 @@ jobs: # echo "QT_PATH=${qtPath}" >> $GITHUB_ENV # echo "$qtPath" >> $GITHUB_PATH - - name: Set up MSVC - shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - where.exe cl.exe + # - name: Set up MSVC + # shell: cmd + # run: | + # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + # where.exe cl.exe - name: Build run: \ From dbce22f2cd0ef2bd1096e81d87c315d2b06c241f Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 13:56:48 +0900 Subject: [PATCH 03/17] updated --- .github/workflows/build-relase.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 1193635..69f9dda 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -18,32 +18,26 @@ jobs: runs-on: windows-latest steps: - - name: Checkout repository with submodules + - name: Checkout repository uses: actions/checkout@main - - name: Add MSBuild to PATH + - name: Checkout msbuild uses: microsoft/setup-msbuild@v2 with: vs-version: '16.11' + msbuild-architecture: x64 + + - name: Set up MSVC + shell: cmd + run: | + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + where.exe cl.exe - name: Set up Qt6 shell: powershell run: | choco install qt6-base-dev where.exe qmake - where.exe cl - - # - name: Set Qt6 Environment Variables - # run: | - # $qtPath = "${{ env.ProgramFiles(x86) }}\Qt\6.5.0\msvc2019_64\bin" - # echo "QT_PATH=${qtPath}" >> $GITHUB_ENV - # echo "$qtPath" >> $GITHUB_PATH - - # - name: Set up MSVC - # shell: cmd - # run: | - # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - # where.exe cl.exe - name: Build run: \ From 632192f0c9961474e57e8436e20f893446032d3f Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 14:10:03 +0900 Subject: [PATCH 04/17] updated --- .github/workflows/build-relase.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 69f9dda..9144cf0 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -22,6 +22,7 @@ jobs: uses: actions/checkout@main - name: Checkout msbuild + id: checkout_msbuild uses: microsoft/setup-msbuild@v2 with: vs-version: '16.11' @@ -30,17 +31,20 @@ jobs: - name: Set up MSVC shell: cmd run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + echo "The output from Step is: ${{ steps.checkout_msbuild.outputs.output_value }}" + call "${{ steps.checkout_msbuild.outputs.output_value }}\VC\Auxiliary\Build\vcvars64.bat" where.exe cl.exe + where.exe nmake.exe - name: Set up Qt6 shell: powershell run: | choco install qt6-base-dev - where.exe qmake - name: Build run: \ + echo $PATH + where.exe qmake qmake nmake From 002913d371313b3d4c95acca8a1e1dcdb9509216 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 14:15:42 +0900 Subject: [PATCH 05/17] updated --- .github/workflows/build-relase.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 9144cf0..a37768e 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -31,8 +31,7 @@ jobs: - name: Set up MSVC shell: cmd run: | - echo "The output from Step is: ${{ steps.checkout_msbuild.outputs.output_value }}" - call "${{ steps.checkout_msbuild.outputs.output_value }}\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" where.exe cl.exe where.exe nmake.exe From b7cc29d107a339f8c19ab37ae492f8f3251f3f12 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 14:23:32 +0900 Subject: [PATCH 06/17] updated --- .github/workflows/build-relase.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index a37768e..3980b19 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -38,10 +38,13 @@ jobs: - name: Set up Qt6 shell: powershell run: | + choco -v + choco upgrade chocolatey + choco -v choco install qt6-base-dev - name: Build - run: \ + run: | echo $PATH where.exe qmake qmake From f220e8fd3001780554d5d86a95845ef843afc407 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 14:39:58 +0900 Subject: [PATCH 07/17] updated --- .github/workflows/build-relase.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 3980b19..473c00e 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -36,16 +36,20 @@ jobs: where.exe nmake.exe - name: Set up Qt6 - shell: powershell + shell: cmd run: | choco -v - choco upgrade chocolatey - choco -v - choco install qt6-base-dev + echo %PATH% + choco install -y qt + echo %PATH% + choco install -y qt6-base-dev + echo %PATH% - name: Build + shell: cmd run: | - echo $PATH + echo "C:\ProgramData\chocolatey\lib\qt\tools" >> $GITHUB_PATH + echo %PATH% where.exe qmake qmake nmake From 9daefb30a43cecfd5aa6462f901869e8cd49a275 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 14:48:18 +0900 Subject: [PATCH 08/17] updated --- .github/workflows/build-relase.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 473c00e..bd7f4a1 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -39,16 +39,12 @@ jobs: shell: cmd run: | choco -v - echo %PATH% - choco install -y qt - echo %PATH% choco install -y qt6-base-dev - echo %PATH% + echo "C:\Qt\6.4.2\mingw_64\bin" >> $GITHUB_PATH - name: Build shell: cmd run: | - echo "C:\ProgramData\chocolatey\lib\qt\tools" >> $GITHUB_PATH echo %PATH% where.exe qmake qmake From 108241b5e60d696f628af50883824773e6d35bf3 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:05:51 +0900 Subject: [PATCH 09/17] updated --- .github/workflows/build-relase.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index bd7f4a1..bf6502d 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout msbuild id: checkout_msbuild - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v2 jurplel/install-qt-action@v3 with: vs-version: '16.11' msbuild-architecture: x64 @@ -35,15 +35,25 @@ jobs: where.exe cl.exe where.exe nmake.exe - - name: Set up Qt6 - shell: cmd - run: | - choco -v - choco install -y qt6-base-dev - echo "C:\Qt\6.4.2\mingw_64\bin" >> $GITHUB_PATH + - name: Install Qt + uses: jurplel/install-qt-action@v4 + with: + version: 6.8 + host: windows + target: desktop + arch: win64_msvc2019_64 + setup-python: false + + # - name: Set up Qt6 + # shell: cmd + # run: | + # choco -v + # choco install -y qt6-base-dev - name: Build shell: cmd + env: + PATH: ${{ env.PATH }};C:\Qt\6.4.2\mingw_64\bin run: | echo %PATH% where.exe qmake From 7a8648732c18735e98c3e639361de5cd8dd29acc Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:11:46 +0900 Subject: [PATCH 10/17] updated --- .github/workflows/build-relase.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index bf6502d..7906992 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -52,12 +52,12 @@ jobs: - name: Build shell: cmd - env: - PATH: ${{ env.PATH }};C:\Qt\6.4.2\mingw_64\bin + # env: + # PATH: ${{ env.PATH }};C:\Qt\6.4.2\mingw_64\bin run: | echo %PATH% where.exe qmake - qmake + qmake CONFIG+=release nmake - name: Create 7Z file From 60d3ff7b2fbf5daca974bb4d4a25e52962340ebe Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:22:44 +0900 Subject: [PATCH 11/17] updated --- .github/workflows/build-relase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 7906992..8deba15 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout msbuild id: checkout_msbuild - uses: microsoft/setup-msbuild@v2 jurplel/install-qt-action@v3 + uses: microsoft/setup-msbuild@v2 with: vs-version: '16.11' msbuild-architecture: x64 From 984d19aaa1c6e45be00d6584358d548258f386f3 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:27:13 +0900 Subject: [PATCH 12/17] updated --- .github/workflows/build-relase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 8deba15..3db6cb8 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -41,7 +41,7 @@ jobs: version: 6.8 host: windows target: desktop - arch: win64_msvc2019_64 + arch: win64_msvc2022_64 setup-python: false # - name: Set up Qt6 From 09dc1537bcac5d2fc663b5021e9880f90f790773 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:31:50 +0900 Subject: [PATCH 13/17] updated --- .github/workflows/build-relase.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 3db6cb8..ba3cada 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -21,6 +21,15 @@ jobs: - name: Checkout repository uses: actions/checkout@main + - name: Install Qt + uses: jurplel/install-qt-action@v4 + with: + version: 6.8 + host: windows + target: desktop + arch: win64_msvc2022_64 + setup-python: false + - name: Checkout msbuild id: checkout_msbuild uses: microsoft/setup-msbuild@v2 @@ -35,28 +44,13 @@ jobs: where.exe cl.exe where.exe nmake.exe - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - version: 6.8 - host: windows - target: desktop - arch: win64_msvc2022_64 - setup-python: false - - # - name: Set up Qt6 - # shell: cmd - # run: | - # choco -v - # choco install -y qt6-base-dev - - name: Build shell: cmd - # env: - # PATH: ${{ env.PATH }};C:\Qt\6.4.2\mingw_64\bin run: | echo %PATH% where.exe qmake + where.exe cl.exe + where.exe nmake.exe qmake CONFIG+=release nmake From fffdf97d842004f95ce9c24bfb6948d580f68956 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:35:11 +0900 Subject: [PATCH 14/17] updated --- .github/workflows/build-relase.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index ba3cada..14e43f9 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -37,16 +37,17 @@ jobs: vs-version: '16.11' msbuild-architecture: x64 - - name: Set up MSVC - shell: cmd - run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - where.exe cl.exe - where.exe nmake.exe + # - name: Set up MSVC + # shell: cmd + # run: | + # call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + # where.exe cl.exe + # where.exe nmake.exe - name: Build shell: cmd run: | + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" echo %PATH% where.exe qmake where.exe cl.exe From d5e0ff52952819d08c082bbbfed6b2c3e3555333 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:40:43 +0900 Subject: [PATCH 15/17] updated --- .github/workflows/build-relase.yml | 74 +++++++++++++----------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 14e43f9..e6f3dc9 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -1,17 +1,17 @@ name: Build and Release -# on: -# push: -# tags: -# - 'v*' - on: push: - branches: - - master - pull_request: - branches: - - master + tags: + - 'v*' + +# on: +# push: +# branches: +# - master +# pull_request: +# branches: +# - master jobs: build: @@ -37,45 +37,37 @@ jobs: vs-version: '16.11' msbuild-architecture: x64 - # - name: Set up MSVC - # shell: cmd - # run: | - # call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - # where.exe cl.exe - # where.exe nmake.exe - - name: Build shell: cmd run: | call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - echo %PATH% - where.exe qmake - where.exe cl.exe - where.exe nmake.exe + # where.exe qmake + # where.exe cl.exe + # where.exe nmake.exe qmake CONFIG+=release nmake - name: Create 7Z file run: | - 7z a cpi-windows.7z cpi.exe LICENSE translations + 7z a cpi-windows.7z cpi.exe Qt6Core.dll LICENSE translations - # - name: Create release - # id: create_release - # uses: actions/create-release@main - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # tag_name: ${{ github.ref }} - # release_name: Release ${{ github.ref }} - # draft: false - # prerelease: false + - name: Create release + id: create_release + uses: actions/create-release@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false - # - name: Upload release asset - # uses: actions/upload-release-asset@main - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: cpi-windows.7z - # asset_name: cpi-windows-${{ github.ref_name }}.7z - # asset_content_type: application/x-7z-compressed + - name: Upload release asset + uses: actions/upload-release-asset@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: cpi-windows.7z + asset_name: cpi-windows-${{ github.ref_name }}.7z + asset_content_type: application/x-7z-compressed From b71ec9aa33734be2c5a94d316f4ae91beecd3e7e Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 15:47:52 +0900 Subject: [PATCH 16/17] updated --- .github/workflows/build-relase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index e6f3dc9..05682b2 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -49,7 +49,7 @@ jobs: - name: Create 7Z file run: | - 7z a cpi-windows.7z cpi.exe Qt6Core.dll LICENSE translations + 7z a cpi-windows.7z cpi.exe cpi.bat Qt6Core.dll LICENSE translations - name: Create release id: create_release From f4fc6c54422192a60956ab3cda48c9c9f6c146e4 Mon Sep 17 00:00:00 2001 From: AOYAMA Kazuharu Date: Sun, 3 Nov 2024 16:23:11 +0900 Subject: [PATCH 17/17] updated --- .github/workflows/build-relase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-relase.yml b/.github/workflows/build-relase.yml index 05682b2..c808885 100644 --- a/.github/workflows/build-relase.yml +++ b/.github/workflows/build-relase.yml @@ -69,5 +69,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: cpi-windows.7z - asset_name: cpi-windows-${{ github.ref_name }}.7z + asset_name: cpi-${{ github.ref_name }}-windows.7z asset_content_type: application/x-7z-compressed