diff options
| author | Saturneric <[email protected]> | 2022-01-12 23:50:43 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-01-12 23:50:43 +0000 |
| commit | da554e707f765ff933a5de71d46955ac6ae698d6 (patch) | |
| tree | 2c361f63e77b3c5db12f4dc9170c3a6923bce0fe | |
| parent | <chore>(project, resource, ci): Fix certificates directories and debug.yml (diff) | |
| download | GpgFrontend-da554e707f765ff933a5de71d46955ac6ae698d6.tar.gz GpgFrontend-da554e707f765ff933a5de71d46955ac6ae698d6.zip | |
<chore>(project, resource, ci): fix ci of release-deb-package.yml and debug.yml
1. Adjust the ci configuration file for macOS and Ubuntu.
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/debug.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/release-deb-package.yml | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index c797cf7f..051838d0 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -104,15 +104,11 @@ jobs: make install if: matrix.os == 'windows-latest' - - name: Configure CMake - # 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}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON - if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-10.15' - - name: Build GpgFrontend - # Build your program with the given configuration - run: cmake -G Ninja --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v + # Build your GpgFrontend with the given configuration + run: | + cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON + cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-10.15' - name: Configure CMake & Build Binary(Windows) diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml index 38f79e86..bfe1164d 100644 --- a/.github/workflows/release-deb-package.yml +++ b/.github/workflows/release-deb-package.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: 'recursive' - + - run: git submodule update --init --recursive - name: Get Short SHA of Commit @@ -48,7 +48,7 @@ jobs: - name: Build & Package GpgFrontend (Linux DEB Package) # Build your program with the given configuration run: | - cmake -B ${{github.workspace}}/build-deb-${{matrix.os}} -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_BUILD_TYPE="Release" -DGENERATE_LINUX_INSTALL_SOFTWARE=ON + cmake -B ${{github.workspace}}/build-deb-${{matrix.os}} -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGENERATE_LINUX_INSTALL_SOFTWARE=ON cmake --build ${{github.workspace}}/build-deb-${{matrix.os}} --config {{$env.BUILD_TYPE}} -- -v cd ${{github.workspace}}/build-deb-${{matrix.os}} ninja package |