Skip to content

Commit

Permalink
Merge pull request #2024 from elBoberido/iox-2011-remove-gcc-5.4-and-…
Browse files Browse the repository at this point in the history
…std-header-check

iox-#2011 Remove gcc 5.4 and std_header_check.sh from CI
  • Loading branch information
elBoberido authored Sep 8, 2023
2 parents c5d1340 + e3e9efd commit 6bbdc6d
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 69 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- name: Install iceoryx dependencies and clang-tidy
uses: ./.github/actions/install-iceoryx-deps-and-clang
- run: ./tools/scripts/clang_format.sh check
- run: ./tools/scripts/list_stl_dependencies.sh check
- run: ./tools/scripts/check_test_ids.sh
- run: ./tools/scripts/check_invalid_characters.sh
- run: ./tools/ci/cmake-linter.sh
Expand All @@ -33,6 +32,7 @@ jobs:
- uses: actions/checkout@v3
- uses: egor-tensin/[email protected]
with:
# gcc 8.3 is compiler used in QNX 7.1
version: 8
platform: x64
- uses: jwlawson/[email protected]
Expand Down Expand Up @@ -133,16 +133,6 @@ jobs:
- name: Run Thread Sanitizer
run: ./tools/ci/build-test-ubuntu-with-sanitizers.sh clang tsan

# gcc 5.4 is compiler used in QNX 7.0
build-test-ubuntu-with-gcc5:
# prevent stuck jobs consuming runners for 6 hours
timeout-minutes: 60
runs-on: ubuntu-latest
needs: pre-flight-check
steps:
- uses: actions/checkout@v3
- run: ./tools/ci/build-test-ubuntu-with-gcc5.sh

# Bazel sanity check
build-test-ubuntu-bazel:
# prevent stuck jobs consuming runners for 6 hours
Expand Down
8 changes: 4 additions & 4 deletions doc/website/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ All iceoryx libraries are deployed as independent CMake packages. Posh is using
- 64-bit hardware (e.g. x86_64 or aarch64; 32-bit hardware might work, but is not supported)
- [CMake](https://cmake.org), 3.16 or later
- One of the following compilers:
- [GCC](https://gcc.gnu.org), 8.3 or later (5.4 currently supported too)
- [GCC](https://gcc.gnu.org), 8.3 or later
- [Clang](https://clang.llvm.org), 9.0 or later
- [MSVC](https://visualstudio.microsoft.com/de/), part of Visual Studio 2019 or later
- [libacl](http://download.savannah.gnu.org/releases/acl/), 2.2 or later. Only for Linux & QNX.
Expand All @@ -35,7 +35,7 @@ make install

### Linux

Although we strive to be fully POSIX-compliant, we recommend using Ubuntu 18.04 and at least GCC 7.5.0 for development.
Although we strive to be fully POSIX-compliant, we recommend using Ubuntu 20.04 and at least GCC 8.3 for development.

You will need to install the following packages:

Expand All @@ -47,7 +47,7 @@ Additionally, there is an optional dependency to the [cpptoml](https://github.co

### QNX

QNX SDP 7.0 and 7.1 are supported (shipping with gcc 5.4 and gcc 8.3 respectively).
QNX SDP 7.1 is supported (shipping with gcc 8.3 respectively).

The easiest way to build iceoryx on QNX is by using the build script and providing a toolchain file.
We provide generic QNX SDP 7.0 toolchain files for ARM_64 and X86_64 in `./tools/toolchains/qnx` ([Direct Link](../../../tools/toolchains/qnx)).
Expand Down Expand Up @@ -118,7 +118,7 @@ The `CMakeLists.txt` from `iceoryx_meta` can be used to easily develop iceoryx w
```

If the compilation fails, it is possible that the compilation failure originates
inside the Windows SDK and is not caused by iceoryx, see
inside the Windows SDK and is not caused by iceoryx, see
[Windows vcpkg-issue \#15035](https://github.com/microsoft/vcpkg/issues/15035#issuecomment-742427969.)
In this case try to rebuild the cmake files with:
```bash
Expand Down
4 changes: 4 additions & 0 deletions doc/website/release-notes/iceoryx-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/vx.x.x...vx.x.x) <!--NOLINT remove this when tag is set-->

**Notes**

- The minimal supported GCC compiler is now 8.3

**Features:**

- Add bazel asan, usan, tsan build config [#1547](https://github.com/eclipse-iceoryx/iceoryx/issues/1547)
Expand Down
54 changes: 0 additions & 54 deletions tools/ci/build-test-ubuntu-with-gcc5.sh

This file was deleted.

3 changes: 3 additions & 0 deletions tools/toolchains/qnx/qnx_sdp70_aarch64le.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0

# @todo iox-#2026 update to QNX 7.1

SET(CMAKE_SYSTEM_PROCESSOR aarch64)
SET(arch gcc_ntoaarch64le)

Expand Down
3 changes: 3 additions & 0 deletions tools/toolchains/qnx/qnx_sdp70_common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0

# @todo iox-#2026 update to QNX 7.1

SET(CMAKE_SYSTEM_NAME QNX)
SET(TOOLCHAIN QNX)

Expand Down
3 changes: 3 additions & 0 deletions tools/toolchains/qnx/qnx_sdp70_x86_64.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0

# @todo iox-#2026 update to QNX 7.1

SET(CMAKE_SYSTEM_PROCESSOR x86_64)
SET(arch gcc_ntox86_64)

Expand Down

0 comments on commit 6bbdc6d

Please sign in to comment.