From bd07dd45fc8cef7123bc8e081291a82cb5422f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Musia=C5=82?= <111433005+SpectraL519@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:51:17 +0100 Subject: [PATCH] * modified gpp and clang forkflows to set both cxx and c compilers correctly * modified the install_clang_format_17.sh script to install both clang-17 and clang-format-17 * Modified the clang forkflow to use the new install_clang_17_toolchain.sh script and use clang-17 to build the project --- .github/workflows/clang.yaml | 12 +++++++++--- .github/workflows/format.yaml | 2 +- .github/workflows/gpp.yaml | 2 +- ...ng_format_17.sh => install_clang_17_toolchain.sh} | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) rename scripts/env/{install_clang_format_17.sh => install_clang_17_toolchain.sh} (61%) diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml index d7bd54b..30a9485 100644 --- a/.github/workflows/clang.yaml +++ b/.github/workflows/clang.yaml @@ -16,14 +16,20 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Prepare + shell: bash + run: | + sudo bash ./scripts/env/install_clang_17_toolchain.sh + continue-on-error: false + - name: Build shell: bash env: - CC: clang-14 - CXX: clang++-14 + CC: clang-17 + CXX: clang++-17 run: | cd example - cmake -B build -DCMAKE_CXX_COMPILER=clang++-14 + cmake -B build -DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_C_COMPILER=clang-17 cd build make continue-on-error: false diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index a5b3585..e6c1581 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -19,7 +19,7 @@ jobs: - name: Prepare shell: bash run: | - sudo bash ./scripts/env/install_clang_format_17.sh + sudo bash ./scripts/env/install_clang_17_toolchain.sh continue-on-error: false - name: Test formatting diff --git a/.github/workflows/gpp.yaml b/.github/workflows/gpp.yaml index 8a327c9..ebe29c9 100644 --- a/.github/workflows/gpp.yaml +++ b/.github/workflows/gpp.yaml @@ -23,7 +23,7 @@ jobs: CXX: g++-11 run: | cd example - cmake -B build -DCMAKE_CXX_COMPILER=g++-11 + cmake -B build -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 cd build make continue-on-error: false diff --git a/scripts/env/install_clang_format_17.sh b/scripts/env/install_clang_17_toolchain.sh similarity index 61% rename from scripts/env/install_clang_format_17.sh rename to scripts/env/install_clang_17_toolchain.sh index 32b2e23..97d07b4 100644 --- a/scripts/env/install_clang_format_17.sh +++ b/scripts/env/install_clang_17_toolchain.sh @@ -1,7 +1,7 @@ #!/bin/bash -if command -v clang-format-17 &>/dev/null; then - echo "clang-format-17 is already installed." +if command -v clang-17 &>/dev/null && command -v clang-format-17 &>/dev/null; then + echo "clang-17 toolchain already installed!" exit 0 fi @@ -12,6 +12,6 @@ echo | sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -sc)/ llvm echo "Updating package list" sudo apt update &>/dev/null 2>&1 -echo "Installing clang-format-17" -sudo apt install clang-format-17 -y &>/dev/null 2>&1 +echo "Installing clang-17 toolchain" +sudo apt install clang-17 clang-format-17 -y &>/dev/null 2>&1 echo "Success!"