diff options
author | Saturneric <[email protected]> | 2021-06-20 09:10:31 +0000 |
---|---|---|
committer | Saturneric <[email protected]> | 2021-06-20 09:10:31 +0000 |
commit | a02379564a10d6657d6aadf357ed1cc6302f6f16 (patch) | |
tree | e1b701e9bba1fff6284b8039fdfa945aa167d20a | |
parent | Update cmake.yml (diff) | |
download | GpgFrontend-a02379564a10d6657d6aadf357ed1cc6302f6f16.tar.gz GpgFrontend-a02379564a10d6657d6aadf357ed1cc6302f6f16.zip |
Update cmake.yml
Fix CMakeLists.txt
Diffstat (limited to '')
-rw-r--r-- | .github/workflows/cmake.yml | 31 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | include/GpgFrontend.h | 6 |
3 files changed, 33 insertions, 6 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8063e312..032d44ba 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -1,4 +1,4 @@ -name: Build and Upload +name: Build and Upload Binary Package on: push: @@ -15,7 +15,7 @@ jobs: build: strategy: matrix: - os: [ 'ubuntu-latest', 'macos-latest' ] + os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ] runs-on: ${{ matrix.os }} steps: @@ -38,6 +38,26 @@ jobs: uses: jurplel/install-qt-action@v2 if: matrix.os == 'ubuntu-latest' + - name: Set up MinGW and QT5 (Windows) + uses: msys2/setup-msys2@v2 + with: + install: git msys2-devel base-devel binutils pactoys-git mercurial cvs wget p7zip perl ruby python2 mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain + update: true + shell: msys2 {0} + run: | + uname -a + sed -i '1s|^|[staging]\nServer = https://repo.msys2.org/staging/\nSigLevel = Never\n[clang32]\nServer = https://repo.msys2.org/mingw/clang32/\n|' /etc/pacman.conf + pacman --noconfirm -Suuy + pacman --noconfirm -Suu + pacman --noconfirm -S cmake autoconf automake mingw-w64-i686-qt-creator mingw-w64-x86_64-qt-creator + if: matrix.os == 'windows-latest' + + - name: Set up Python3.8 (Windows) + uses: actions/setup-python@v2 + with: + python-version: '3.8' + if: matrix.os == 'windows-latest' + - name: Build GpgME run: | git clone https://github.com/gpg/gpgme @@ -69,3 +89,10 @@ jobs: name: gpgfrontend-macos-release path: ${{github.workspace}}/build/release/* if: matrix.os == 'macos-latest' + + - name: Upload Artifact(Windows) + uses: actions/upload-artifact@master + with: + name: gpgfrontend-windows-release + path: ${{github.workspace}}/build/release/* + if: matrix.os == 'windows-latest' diff --git a/CMakeLists.txt b/CMakeLists.txt index 11d85685..76220cfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ endif() if(APPLE) - message(STATUS, "Configuration For OS Platform MacOS") + message(STATUS "Configuration For OS Platform MacOS") set(ENV{Qt5_DIR} /usr/local/opt/qt5/lib/cmake) diff --git a/include/GpgFrontend.h b/include/GpgFrontend.h index 1b5056ee..c9988fab 100644 --- a/include/GpgFrontend.h +++ b/include/GpgFrontend.h @@ -18,15 +18,15 @@ #define PROJECT_NAME "GpgFrontend" #define BUILD_VERSION "1.0.0_Windows-10.0.19042_AMD64_Release" -#define GIT_VERSION "main_ecd0e478c9a84d1d750a827bf80e3ca2ec97adc9" +#define GIT_VERSION "main_987b04aac3bae8779c7b0af0dae7bd3f8a9047d3" #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define BUILD_TIMESTAMP "2021-06-20 16:06:56" +#define BUILD_TIMESTAMP "2021-06-20 16:54:59" #define GIT_BRANCH_NAME "main" -#define GIT_COMMIT_HASH "ecd0e478c9a84d1d750a827bf80e3ca2ec97adc9" +#define GIT_COMMIT_HASH "987b04aac3bae8779c7b0af0dae7bd3f8a9047d3" #endif //GPGFRONTEND_H_IN |