Skip to content

Commit

Permalink
Update CircleCI build config
Browse files Browse the repository at this point in the history
Disable one GCC/Mingw warning flag that was enabled as part of a group and seems to be buggy.

Disable two GCC/Mingw warning flags which we are not yet ready to enable. These were not specified previously for OPHD, though are now being used in NAS2D.
  • Loading branch information
DanRStevens committed Mar 10, 2025
1 parent fb33133 commit 7ae2148
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,13 @@ jobs:
- checkout
- run: git submodule update --init nas2d-core/
- brew-install
- run:
name: Add Brew include path to system include paths
command: |
echo "export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}:$(brew --prefix)/include" >> "${BASH_ENV}"
echo "export LDFLAGS_EXTRA=-L$(brew --prefix)/lib" >> "${BASH_ENV}"
- build
build-linux-gcc:
docker:
- image: ghcr.io/lairworks/build-env-nas2d-gcc:1.6
environment:
WARN_EXTRA: -Wsuggest-override -Wno-dangling-reference
Toolchain: "gcc"
WARN_EXTRA: "-Wno-dangling-reference -Wno-useless-cast -Wno-effc++"
steps:
- checkout
- run: git submodule update --init nas2d-core/
Expand All @@ -46,7 +42,7 @@ jobs:
docker:
- image: ghcr.io/lairworks/build-env-nas2d-clang:1.5
environment:
WARN_EXTRA: -Wunknown-pragmas -Wimplicit-int-conversion -Wunreachable-code -Wunreachable-code-return -Wunreachable-code-break -Wcovered-switch-default -Wshadow-field -Wextra-semi -Wextra-semi-stmt -Wnewline-eof -Wdocumentation -Wdocumentation-unknown-command -Wheader-hygiene -Winconsistent-missing-destructor-override -Wdeprecated-copy-dtor -Wformat-nonliteral
Toolchain: "clang"
steps:
- checkout
- run: git submodule update --init nas2d-core/
Expand All @@ -55,8 +51,8 @@ jobs:
docker:
- image: ghcr.io/lairworks/build-env-nas2d-mingw:1.13
environment:
WARN_EXTRA: "-Wno-redundant-decls -Wno-dangling-reference"
LDFLAGS_EXTRA: "-L/usr/local/x86_64-w64-mingw32/lib"
Toolchain: "mingw"
WARN_EXTRA: "-Wno-dangling-reference -Wno-useless-cast -Wno-effc++"
steps:
- checkout
- run: git submodule update --init nas2d-core/
Expand Down

0 comments on commit 7ae2148

Please sign in to comment.