diff options
| author | Saturneric <[email protected]> | 2021-06-20 10:41:29 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2021-06-20 10:41:29 +0000 |
| commit | f5258d8f7a1281097b64d9f818510302bb212034 (patch) | |
| tree | b509fb633ae01b56af2580973fd2e7e6bf52aa49 | |
| parent | Fix cmake.yml For Windows Build. (diff) | |
| download | GpgFrontend-f5258d8f7a1281097b64d9f818510302bb212034.tar.gz GpgFrontend-f5258d8f7a1281097b64d9f818510302bb212034.zip | |
Fix cmake.yml For Windows Build.
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/cmake.yml | 21 | ||||
| -rw-r--r-- | include/GpgFrontend.h | 6 |
2 files changed, 14 insertions, 13 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7b4992a5..13fddd2f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -2,9 +2,9 @@ name: Build and Upload Binary Package on: push: - branches: [ main ] + branches: [ main, develop ] pull_request: - branches: [ main ] + branches: [ main, develop ] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) @@ -48,7 +48,7 @@ jobs: - name: Set up Dependence (Windows) shell: msys2 {0} run: | - pacman --noconfirm -Syu cmake autoconf automake mingw-w64-x86_64-qt-creator libgpgme + pacman --noconfirm -Syu mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-qt-creator libgpgme if: matrix.os == 'windows-latest' - name: Build GpgME @@ -74,34 +74,35 @@ jobs: - name: Configure CMake (Windows) shell: msys2 {0} - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEXECUTABLE_OUTPUT_PATH=${{env.EXECUTABLE_OUTPUT_PATH}} + run: | + cd ${{github.workspace}} + mkdir build && cd build + cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEXECUTABLE_OUTPUT_PATH=${{env.EXECUTABLE_OUTPUT_PATH}} .. if: matrix.os == 'windows-latest' - name: Build GpgFrontend (Windows) shell: msys2 {0} # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j 2 + run: cmake --build . --config ${{env.BUILD_TYPE}} -- -j 2 if: matrix.os == 'windows-latest' - name: Upload Artifact(Linux) uses: actions/upload-artifact@master with: - name: gpgfrontend-linux-release + name: gpgfrontend-linux-release-${{github.sha}} path: ${{github.workspace}}/build/release/* if: matrix.os == 'ubuntu-latest' - name: Upload Artifact(macOS) uses: actions/upload-artifact@master with: - name: gpgfrontend-macos-release + name: gpgfrontend-macos-release-${{github.sha}} path: ${{github.workspace}}/build/release/* if: matrix.os == 'macos-latest' - name: Upload Artifact(Windows) uses: actions/upload-artifact@master with: - name: gpgfrontend-windows-release + name: gpgfrontend-windows-release-${{github.sha}} path: ${{github.workspace}}/build/release/* if: matrix.os == 'windows-latest' diff --git a/include/GpgFrontend.h b/include/GpgFrontend.h index c9988fab..5bd7219e 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_987b04aac3bae8779c7b0af0dae7bd3f8a9047d3" +#define GIT_VERSION "main_2104aa97267bd755f9fdffbf35f472929418de6b" #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define BUILD_TIMESTAMP "2021-06-20 16:54:59" +#define BUILD_TIMESTAMP "2021-06-20 18:28:34" #define GIT_BRANCH_NAME "main" -#define GIT_COMMIT_HASH "987b04aac3bae8779c7b0af0dae7bd3f8a9047d3" +#define GIT_COMMIT_HASH "2104aa97267bd755f9fdffbf35f472929418de6b" #endif //GPGFRONTEND_H_IN |