Skip to content

Commit 45371d8

Browse files
authored
Merge pull request #1880 from ApexAI/iox-1781-rework-compilers-in-CI
Iox 1781 update GitHub CI workflows
2 parents 998b5a4 + b4c4c0a commit 45371d8

File tree

8 files changed

+22
-124
lines changed

8 files changed

+22
-124
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ E.g. Ubuntu 18.04 LTS
1515
**Compiler version:**
1616
E.g. GCC 7.4.0
1717

18+
**Eclipse iceoryx version:**
19+
E.g. `v1.2.3` or `master` branch
20+
1821
**Observed result or behaviour:**
1922
A clear and precise description of the observed result.
2023

.github/workflows/build-test.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pre-flight-check:
1414
# prevent stuck jobs consuming runners for 6 hours
1515
timeout-minutes: 60
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Install iceoryx dependencies and clang-tidy
@@ -62,7 +62,7 @@ jobs:
6262
build-test-windows:
6363
# prevent stuck jobs consuming runners for 6 hours
6464
timeout-minutes: 60
65-
runs-on: windows-2019
65+
runs-on: windows-latest
6666
needs: pre-flight-check
6767
steps:
6868
- uses: actions/checkout@v3
@@ -76,7 +76,7 @@ jobs:
7676
needs: pre-flight-check
7777
steps:
7878
- name: Setup ROS
79-
uses: ros-tooling/setup-ros@v0.3
79+
uses: ros-tooling/setup-ros@v0.5
8080
with:
8181
required-ros-distributions: foxy
8282
- uses: actions/checkout@v3
@@ -85,12 +85,12 @@ jobs:
8585
build-test-ubuntu-with-address-sanitizer-gcc-latest:
8686
# prevent stuck jobs consuming runners for 1 hour
8787
timeout-minutes: 60
88-
runs-on: ubuntu-20.04
88+
runs-on: ubuntu-latest
8989
needs: pre-flight-check
9090
steps:
9191
- uses: egor-tensin/[email protected]
9292
with:
93-
version: 11
93+
version: 12
9494
platform: x64
9595
- uses: actions/checkout@v3
9696
- name: Run Address Sanitizer
@@ -120,15 +120,14 @@ jobs:
120120
run: ./tools/ci/build-test-macos-with-sanitizers.sh asan
121121

122122
# gcc 5.4 is compiler used in QNX 7.0
123-
build-test-ubuntu-with-gcc54:
123+
build-test-ubuntu-with-gcc5:
124124
# prevent stuck jobs consuming runners for 6 hours
125125
timeout-minutes: 60
126-
runs-on: ubuntu-18.04
126+
runs-on: ubuntu-latest
127127
needs: pre-flight-check
128128
steps:
129-
- uses: egor-tensin/[email protected]
130129
- uses: actions/checkout@v3
131-
- run: ./tools/ci/build-test-ubuntu-with-gcc54.sh
130+
- run: ./tools/ci/build-test-ubuntu-with-gcc5.sh
132131

133132
# Bazel sanity check
134133
build-test-ubuntu-bazel:
@@ -143,7 +142,7 @@ jobs:
143142
coverage-and-docs:
144143
# prevent stuck jobs consuming runners for 6 hours
145144
timeout-minutes: 60
146-
runs-on: ubuntu-20.04
145+
runs-on: ubuntu-latest
147146
needs: pre-flight-check
148147
steps:
149148
- uses: actions/checkout@v3

.github/workflows/lint_master.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,6 @@ on:
55
branches: [ master ]
66

77
jobs:
8-
axivion:
9-
runs-on: ubuntu-latest
10-
11-
steps:
12-
- name : Checkout
13-
uses: actions/checkout@v3
14-
15-
- name: Trigger pipeline
16-
env:
17-
AXIVION_TRIGGER_TOKEN: ${{ secrets.AXIVION_TRIGGER_TOKEN }}
18-
AXIVION_READ_API_TOKEN: ${{ secrets.AXIVION_READ_API_TOKEN }}
19-
run: |
20-
cd $GITHUB_WORKSPACE
21-
pip3 install requests
22-
PIPELINE_ID="$(./tools/axivion/trigger_pipeline.py)"
23-
./tools/axivion/wait_for_pipeline.py "${PIPELINE_ID}"
24-
258
build-test-ubuntu-with-thread-sanitizer-clang-latest:
269
# prevent stuck jobs consuming runners for 3 hours
2710
timeout-minutes: 180

iceoryx_platform/qnx/include/iceoryx_platform/semaphore.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#ifndef IOX_HOOFS_QNX_PLATFORM_SEMAPHORE_HPP
1818
#define IOX_HOOFS_QNX_PLATFORM_SEMAPHORE_HPP
1919

20+
#include <climits>
2021
#include <cstdint>
2122
#include <semaphore.h>
2223

tools/axivion/trigger_pipeline.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

tools/axivion/wait_for_pipeline.py

Lines changed: 0 additions & 52 deletions
This file was deleted.

tools/ci/build-test-ubuntu-with-gcc54.sh renamed to tools/ci/build-test-ubuntu-with-gcc5.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ msg() {
2626
WORKSPACE=$(git rev-parse --show-toplevel)
2727
cd "${WORKSPACE}"
2828

29+
sudo touch /etc/apt/sources.list.d/ubuntu_bionic.list
30+
31+
sudo echo "\
32+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ bionic main universe\
33+
" | sudo tee /etc/apt/sources.list.d/ubuntu_bionic.list;
34+
35+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
36+
2937
msg "installing build dependencies"
3038
sudo apt-get update && sudo apt-get install -y libacl1-dev libncurses5-dev gcc-5 g++-5
3139

tools/scripts/used-headers.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# QNX platform / libc headers
22
arpa/inet.h
3+
climits
34
cstdint
45
dlfcn.h
56
errno.h

0 commit comments

Comments
 (0)