From a706fea5b9469cccc2122d62471ed11854d36e49 Mon Sep 17 00:00:00 2001 From: Khalil Estell Date: Fri, 13 Dec 2024 07:56:12 -0800 Subject: [PATCH] :bug: Fix clang-tidy install in deploy --- .github/workflows/deploy.yml | 16 ++++++++++++++-- .github/workflows/deploy_linux.yml | 19 ++++++++++++++----- .github/workflows/self_check.yml | 12 ++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0ebd442..f8493ba 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,7 +50,7 @@ on: jobs: deploy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4.1.1 if: ${{ inputs.version != '' && inputs.external_package == false}} @@ -65,8 +65,20 @@ jobs: submodules: true repository: ${{ inputs.repo }} + - name: 📥 Install OS Specific Tools + run: | + sudo apt remove clang-tidy + sudo rm -f /usr/bin/clang-tidy + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + sudo ./llvm.sh 17 + sudo apt install libc++-17-dev libc++abi-17-dev + sudo apt-get install pipx + pipx ensurepath + sudo apt install clang-tidy-17 + - name: 📥 Install Conan ${{ inputs.conan_version }} - run: pip3 install conan==${{ inputs.conan_version }} + run: pipx install conan==${{ inputs.conan_version }} - name: 📡 Add `libhal` repo to conan remotes run: conan remote add libhal diff --git a/.github/workflows/deploy_linux.yml b/.github/workflows/deploy_linux.yml index 1d53ee1..bfd03cc 100644 --- a/.github/workflows/deploy_linux.yml +++ b/.github/workflows/deploy_linux.yml @@ -32,7 +32,7 @@ on: jobs: deploy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4.1.1 if: ${{ inputs.version != '' }} @@ -47,11 +47,20 @@ jobs: submodules: true repository: ${{ inputs.repo }} - - name: 📥 Install Conan ${{ inputs.conan_version }} - run: pip3 install conan==${{ inputs.conan_version }} - - name: 📥 Install OS Specific Tools - run: sudo apt remove clang-tidy && wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 17 && sudo apt install libc++-17-dev libc++abi-17-dev && sudo apt-get install pipx && pipx ensurepath && sudo apt install clang-tidy-17 + run: | + sudo apt remove clang-tidy + sudo rm -f /usr/bin/clang-tidy + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + sudo ./llvm.sh 17 + sudo apt install libc++-17-dev libc++abi-17-dev + sudo apt-get install pipx + pipx ensurepath + sudo apt install clang-tidy-17 + + - name: 📥 Install Conan ${{ inputs.conan_version }} + run: pipx install conan==${{ inputs.conan_version }} - name: 📡 Install default linux profiles run: conan config install -sf profiles/x86_64/linux/ -tf profiles https://github.com/libhal/conan-config.git diff --git a/.github/workflows/self_check.yml b/.github/workflows/self_check.yml index 10c0cbe..1efb61c 100644 --- a/.github/workflows/self_check.yml +++ b/.github/workflows/self_check.yml @@ -109,6 +109,18 @@ jobs: repo: libhal/libhal-iot secrets: inherit + deploy-libhal: + uses: ./.github/workflows/deploy.yml + with: + library: libhal + repo: libhal/libhal + arch: x86_64 + os: Linux + compiler: gcc + compiler_version: 12.3 + compiler_package: "" + secrets: inherit + libhal-arm-mcu-deploy-cortex-m4f: uses: ./.github/workflows/deploy.yml with: