Skip to content

Commit

Permalink
Local CI updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@CJLove
CJLove committed Feb 4, 2024
1 parent 8530601 commit 90ff30f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
29 changes: 16 additions & 13 deletions .gitea/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@ jobs:
max-parallel: 4
matrix:
config:
- { name: g++13, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Debug, cppstd: 17 }
- { name: g++13, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Release, cppstd: 17 }
- { name: clang16, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/clang, cxx: /usr/bin/clang++, build_type: Debug, cppstd: 17 }
- { name: clang16, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/clang, cxx: /usr/bin/clang++, build_type: Release, cppstd: 17 }
- { name: asan, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: asan, cppstd: 17 }
- { name: tsan, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: tsan, cppstd: 17 }
- { name: ubsan, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: ubsan, cppstd: 17 }
- { name: g++8.4.0, image: fir.love.io:3005/amd64/config-cpp-gcc840, cc: /opt/gcc840/bin/gcc, cxx: /opt/gcc840/bin/g++, build_type: Debug, cppstd: 14 }
- { name: g++8.4.0, image: fir.love.io:3005/amd64/config-cpp-gcc840, cc: /opt/gcc840/bin/gcc, cxx: /opt/gcc840/bin/g++, build_type: Debug, cppstd: 14 }
- { name: g++10.3.0, image: fir.love.io:3005/amd64/config-cpp-gcc1030, cc: /opt/gcc1030/bin/gcc, cxx: /opt/gcc1030/bin/g++, build_type: Debug, cppstd: 14 }
- { name: g++11.3.0, image: fir.love.io:3005/amd64/config-cpp-gcc1130, cc: /opt/gcc1130/bin/gcc, cxx: /opt/gcc1130/bin/g++, build_type: Debug, cppstd: 14 }
- { name: g++12.3.0, image: fir.love.io:3005/amd64/config-cpp-gcc1230, cc: /opt/gcc1230/bin/gcc, cxx: /opt/gcc1230/bin/g++, build_type: Debug, cppstd: 20 }
- { name: g++13, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Debug, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: g++13, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Release, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: yaml, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Release, cppstd: 17, yaml: ON, toml: OFF, json: OFF }
- { name: toml, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Release, cppstd: 17, yaml: OFF, toml: ON, json: OFF }
- { name: json, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: Release, cppstd: 17, yaml: OFF, toml: OFF, json: ON }
- { name: clang16, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/clang, cxx: /usr/bin/clang++, build_type: Debug, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: clang16, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/clang, cxx: /usr/bin/clang++, build_type: Release, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: asan, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: asan, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: tsan, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: tsan, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: ubsan, image: fir.love.io:3005/amd64/config-cpp-gcc1311, cc: /usr/bin/gcc, cxx: /usr/bin/g++, build_type: ubsan, cppstd: 17, yaml: ON, toml: ON, json: ON }
- { name: g++8.4.0, image: fir.love.io:3005/amd64/config-cpp-gcc840, cc: /opt/gcc840/bin/gcc, cxx: /opt/gcc840/bin/g++, build_type: Debug, cppstd: 14, yaml: ON, toml: ON, json: ON }
- { name: g++8.4.0, image: fir.love.io:3005/amd64/config-cpp-gcc840, cc: /opt/gcc840/bin/gcc, cxx: /opt/gcc840/bin/g++, build_type: Debug, cppstd: 14, yaml: ON, toml: ON, json: ON }
- { name: g++10.3.0, image: fir.love.io:3005/amd64/config-cpp-gcc1030, cc: /opt/gcc1030/bin/gcc, cxx: /opt/gcc1030/bin/g++, build_type: Debug, cppstd: 14, yaml: ON, toml: ON, json: ON }
- { name: g++11.3.0, image: fir.love.io:3005/amd64/config-cpp-gcc1130, cc: /opt/gcc1130/bin/gcc, cxx: /opt/gcc1130/bin/g++, build_type: Debug, cppstd: 14, yaml: ON, toml: ON, json: ON }
- { name: g++12.3.0, image: fir.love.io:3005/amd64/config-cpp-gcc1230, cc: /opt/gcc1230/bin/gcc, cxx: /opt/gcc1230/bin/g++, build_type: Debug, cppstd: 20, yaml: ON, toml: ON, json: ON }

name: "${{ matrix.config.name}} (C++${{ matrix.config.cppstd }}, ${{ matrix.config.build_type }})"
steps:
Expand All @@ -39,4 +42,4 @@ jobs:
options: --rm --volumes-from=${{ env.JOB_CONTAINER_NAME }}
run: |
cd ${{ gitea.workspace }}
./build.sh -cc=${{ matrix.config.cc }} --cxx=${{ matrix.config.cxx }} --cmake="-DCMAKE_BUILD_TYPE=${{ matrix.config.cppstd }} -DCMAKE_CXX_STD=${{ matrix.config.cppstd }}"
./build.sh -cc=${{ matrix.config.cc }} --cxx=${{ matrix.config.cxx }} --cmake="-DCMAKE_BUILD_TYPE=${{ matrix.config.cppstd }} -DCMAKE_CXX_STD=${{ matrix.config.cppstd }} -DYAML_SUPPORT=${{ matrix.config.yaml }} -DTOML_SUPPORT=${{ matrix.config.toml }} -DJSON_SUPPORT=${{ matrix.config.json }}"
2 changes: 1 addition & 1 deletion build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ ret=$?
[ $ret -ne 0 ] && exit $ret

if [ $PARAM_COVER -eq 1 ]; then
# Run SerfCppCoverage to get unit test report and code coverage info
# Run CofigCppCoverage to get unit test report and code coverage info
make ConfigCppCoverage
ret=$?
if [ $ret -eq 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/gcc1311.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ inputs:

run:
path: ./config-cpp-git/build.sh
args: [ "-concourse", "-builddir=build", "-cover" ]
args: [ "-concourse", "-builddir=build" ]

0 comments on commit 90ff30f

Please sign in to comment.