.github: use clang/clang++ instead of clang-7/clang++-7

this prevent failures on build_ci.sh
ArduPilot · Oct 1, 2021 · 28a2c1b · 28a2c1b
1 parent 920ccb0
commit 28a2c1b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/test_chibios.yml b/.github/workflows/test_chibios.yml
@@ -71,8 +71,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "chibios-clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/usr/lib/ccache:/opt/gcc-arm-none-eabi-${{matrix.gcc}}/bin:$PATH"
           PATH="/github/home/.local/bin:$PATH"

diff --git a/.github/workflows/test_linux_sbc.yml b/.github/workflows/test_linux_sbc.yml
@@ -73,8 +73,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           Tools/scripts/build_ci.sh

diff --git a/.github/workflows/test_replay.yml b/.github/workflows/test_replay.yml
@@ -54,8 +54,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           Tools/scripts/build_ci.sh

diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl

diff --git a/.github/workflows/test_sitl_plane.yml b/.github/workflows/test_sitl_plane.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl

diff --git a/.github/workflows/test_sitl_rover.yml b/.github/workflows/test_sitl_rover.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl

diff --git a/.github/workflows/test_sitl_sub.yml b/.github/workflows/test_sitl_sub.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl

diff --git a/.github/workflows/test_sitl_tracker.yml b/.github/workflows/test_sitl_tracker.yml
@@ -49,8 +49,8 @@ jobs:
         shell: bash
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           ./waf configure --board sitl

diff --git a/.github/workflows/test_unit_tests.yml b/.github/workflows/test_unit_tests.yml
@@ -59,8 +59,8 @@ jobs:
         shell: 'script -q -e -c "bash {0}"'
         run: |
           if [[ ${{ matrix.toolchain }} == "clang" ]]; then
-            export CC=clang-7
-            export CXX=clang++-7
+            export CC=clang
+            export CXX=clang++
           fi
           PATH="/github/home/.local/bin:$PATH"
           Tools/scripts/build_ci.sh