mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #124 from mat007/fix-ci

Browse source 
Fix CI
This commit is contained in:
Mathieu Champlon 2024-09-29 14:52:23 +02:00 • committed by GitHub
commit 636c59b93a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.github/workflows/ci.yml vendored
View file

@ -26,7 +26,7 @@ jobs:
Formatting: Formatting:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Formatting - name: Formatting
uses: DoozyX/clang-format-lint-action@v0.13 uses: DoozyX/clang-format-lint-action@v0.13
with: with:
@ -42,17 +42,19 @@ jobs:
matrix: matrix:
include: include:
# Linux, gcc # Linux, gcc
- { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - { compiler: gcc-7, cxxstd: '14,17', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
- { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - { compiler: gcc-10, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 }
- { compiler: gcc-12,cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 } - { compiler: gcc-12, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
- { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
- { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 }
# Linux, clang # Linux, clang
- { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - { compiler: clang-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
- { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - { compiler: clang-18, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 }
- { compiler: clang-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 } - { compiler: clang-18, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 }
- { name: Collect coverage, coverage: yes, - { name: Collect coverage, coverage: yes,
compiler: gcc-8, cxxstd: '14', boostBranch: master, os: ubuntu-20.04 } compiler: gcc-8, cxxstd: '14', boostBranch: boost-1.86.0, os: ubuntu-20.04 }
timeout-minutes: 120 timeout-minutes: 120
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
@ -74,7 +76,7 @@ jobs:
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ git cmake apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ git cmake
git config --global pack.threads 0 git config --global pack.threads 0
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
# For coverage builds fetch the whole history, else only 1 commit using a 'fake ternary' # For coverage builds fetch the whole history, else only 1 commit using a 'fake ternary'
fetch-depth: ${{ matrix.coverage && '0' || '1' }} fetch-depth: ${{ matrix.coverage && '0' || '1' }}
@ -86,7 +88,7 @@ jobs:
path: boost-root path: boost-root
key: boost-${{matrix.boostBranch}} key: boost-${{matrix.boostBranch}}
- name: Checkout Boost - name: Checkout Boost
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
repository: boostorg/boost repository: boostorg/boost
ref: ${{matrix.boostBranch}} ref: ${{matrix.boostBranch}}
@ -127,11 +129,7 @@ jobs:
- name: Boost build - name: Boost build
run: | run: |
if [[ "${{matrix.boostBranch}}" == "master" ]]; then
B2_FLAGS="cxxstd=${{matrix.cxxstd}}" B2_FLAGS="cxxstd=${{matrix.cxxstd}}"
else
B2_FLAGS="cxxflags=-std=c++${{matrix.cxxstd}}"
fi
if [[ "${{matrix.coverage}}" == "yes" ]]; then if [[ "${{matrix.coverage}}" == "yes" ]]; then
B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage" B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage"
fi fi

4
.github/workflows/release.yml vendored
View file

@ -17,8 +17,8 @@ jobs:
BOOST_VERSION: 1.71.0 BOOST_VERSION: 1.71.0
BOOST_ROOT: ${{github.workspace}}/dependencies/boost BOOST_ROOT: ${{github.workspace}}/dependencies/boost
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
repository: boostorg/boost repository: boostorg/boost
ref: boost-${{env.BOOST_VERSION}} ref: boost-${{env.BOOST_VERSION}}