From 7660bca336f70af7a2af46c4c8b3063d6249aea9 Mon Sep 17 00:00:00 2001 From: ado Date: Wed, 24 Feb 2021 17:24:48 +0100 Subject: [PATCH] try ci update --- .github/workflows/ubuntu-latest-icc.yml | 49 +++++++++++++++++++ .github/workflows/vs16.yml | 47 ------------------ .../{msys2-clang.yml => win-msys2-clang.yml} | 2 +- .../{msys2-gcc.yml => win-msys2-gcc.yml} | 2 +- 4 files changed, 51 insertions(+), 49 deletions(-) create mode 100644 .github/workflows/ubuntu-latest-icc.yml delete mode 100644 .github/workflows/vs16.yml rename .github/workflows/{msys2-clang.yml => win-msys2-clang.yml} (98%) rename .github/workflows/{msys2-gcc.yml => win-msys2-gcc.yml} (98%) diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml new file mode 100644 index 0000000..db07a2f --- /dev/null +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -0,0 +1,49 @@ +name: ubuntu-latest-icc-ci + +on: [push, pull_request] + branches: + - master + - feature/** + - improvement/** + - bugfix/** + +jobs: + gcc_tests: + if: >- + ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && + ! contains(toJSON(github.event.commits.*.message), '[skip github]') + + strategy: + matrix: + version: [10, 9, 8] + + runs-on: ubuntu-latest + + name: GCC ${{ matrix.version }} + + container: + image: gcc:${{ matrix.version }} + + options: -v /usr/local:/host_usr_local + + steps: + - uses: actions/checkout@v1 + + - uses: friendlyanon/fetch-core-count@v1 + id: cores + + - name: CMake + run: echo "/host_usr_local/bin" >> $GITHUB_PATH + + - name: Install dependencies + run: script/ci_install_deps.sh + + - name: Configure + run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug + + - name: Build + run: cmake --build build -j ${{ steps.cores.outputs.count }} + + - name: Run + working-directory: build + run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} diff --git a/.github/workflows/vs16.yml b/.github/workflows/vs16.yml deleted file mode 100644 index b385b02..0000000 --- a/.github/workflows/vs16.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: vs19-ci - -on: - push: - branches: - - master - - feature/** - - improvement/** - - bugfix/** - - pull_request: - branches: - - master - - feature/** - - improvement/** - - bugfix/** - -jobs: - ci: - name: windows-vs19 - runs-on: windows-latest - defaults: - run: - shell: bash - strategy: - fail-fast: false - matrix: - include: - - {gen: Visual Studio 19 2019, install: git, arch: Win32} - - {gen: Visual Studio 19 2019, install: git, arch: x64} - - steps: - - name: checkout - uses: actions/checkout@v2 - - - name: Install dependencies - run: script/ci_install_deps.sh - - - name: Configure - run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug - - - name: Build - run: cmake --build build -j ${{ steps.cores.outputs.count }} - - - name: Run - working-directory: build - run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} diff --git a/.github/workflows/msys2-clang.yml b/.github/workflows/win-msys2-clang.yml similarity index 98% rename from .github/workflows/msys2-clang.yml rename to .github/workflows/win-msys2-clang.yml index 21a2abd..76322c7 100644 --- a/.github/workflows/msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -1,4 +1,4 @@ -name: msys2-clang-ci +name: win-msys2-clang-ci on: push: diff --git a/.github/workflows/msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml similarity index 98% rename from .github/workflows/msys2-gcc.yml rename to .github/workflows/win-msys2-gcc.yml index 2bba3fc..6e12a2b 100644 --- a/.github/workflows/msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -1,4 +1,4 @@ -name: msys2-gcc-ci +name: win-msys2-gcc-ci on: push: