diff options
| author | Saturn&Eric <[email protected]> | 2021-06-20 13:48:03 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-20 13:48:03 +0000 |
| commit | d099baf165bd36bee1f9673c2df212669905e608 (patch) | |
| tree | c46ffc52a6ce3e1317e2a2b78bb2930860f8dfdb | |
| parent | Update cmake.yml (diff) | |
| download | GpgFrontend-d099baf165bd36bee1f9673c2df212669905e608.tar.gz GpgFrontend-d099baf165bd36bee1f9673c2df212669905e608.zip | |
Update cmake.yml
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/cmake.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f5945602..1da73b07 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -59,18 +59,18 @@ jobs: ./configure && make -j2 sudo make install cd .. - if: matrix.os == 'ubuntu-latest' && matrix.os == 'macos-latest' + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-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}} -DEXECUTABLE_OUTPUT_PATH=${{env.EXECUTABLE_OUTPUT_PATH}} - if: matrix.os == 'ubuntu-latest' && matrix.os == 'macos-latest' + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' - name: Build GpgFrontend # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}} -- -j 2 - if: matrix.os == 'ubuntu-latest' && matrix.os == 'macos-latest' + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' - name: Configure CMake & Build Binary(Windows) shell: msys2 {0} |