diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2020-02-20 11:07:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 11:07:24 +0100 |
| commit | 39cf5266dd24a9911d744790dd790ba7f46b222d (patch) | |
| tree | 818388ff48d85d7b20a39e394b1de195d561e35b | |
| parent | 9fd5d3e00bac970dcdb15010a7eef381c4a44c14 (diff) | |
| parent | f24d01e83c3eb4cbc7a88a11e6ceb64ea0471ce7 (diff) | |
| download | ninja-39cf5266dd24a9911d744790dd790ba7f46b222d.tar.gz | |
Merge pull request #1745 from scivision/ciupdate
CI: update CMake use
| -rw-r--r-- | .github/workflows/linux.yml | 22 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 12 |
3 files changed, 27 insertions, 19 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2febee2..aaa8d92 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,25 +12,29 @@ jobs: container: image: centos:7 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install dependencies run: | - curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.sh - chmod +x cmake-3.16.2-Linux-x86_64.sh - ./cmake-3.16.2-Linux-x86_64.sh --skip-license --prefix=/usr/local + curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.sh + chmod +x cmake-3.16.4-Linux-x86_64.sh + ./cmake-3.16.4-Linux-x86_64.sh --skip-license --prefix=/usr/local curl -L -O https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/p7zip-16.02-10.el7.x86_64.rpm curl -L -O https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/p7zip-plugins-16.02-10.el7.x86_64.rpm rpm -U --quiet p7zip-16.02-10.el7.x86_64.rpm rpm -U --quiet p7zip-plugins-16.02-10.el7.x86_64.rpm yum install -y make gcc-c++ + - name: Build ninja shell: bash run: | - mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=Release .. - cmake --build . --parallel --config Release - ctest -vv - strip ninja + cmake -DCMAKE_BUILD_TYPE=Release -B build + cmake --build build --parallel --config Release + strip build/ninja + + - name: Test ninja + run: ctest -vv + working-directory: build + - name: Create ninja archive run: | mkdir artifact diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2a7c100..a22a9bb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install dependencies run: brew install re2c p7zip cmake @@ -19,10 +19,12 @@ jobs: - name: Build ninja shell: bash run: | - mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=Release .. - cmake --build . --parallel --config Release - ctest -vv + cmake -DCMAKE_BUILD_TYPE=Release -B build + cmake --build build --parallel --config Release + + - name: Test ninja + run: ctest -vv + working-directory: build - name: Create ninja archive shell: bash diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bdec6c9..d961582 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,7 +11,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install dependencies run: choco install re2c @@ -19,10 +19,12 @@ jobs: - name: Build ninja shell: bash run: | - mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=Release .. - cmake --build . --parallel --config Release - ctest -vv + cmake -DCMAKE_BUILD_TYPE=Release -B build + cmake --build build --parallel --config Release + + - name: Test ninja + run: ctest -vv + working-directory: build - name: Create ninja archive shell: bash |