Merge pull request #144 from OpenBrickProtocolFoundation/142-update-t…

…o-llvm-18 update to clang / llvm 18
OpenBrickProtocolFoundation · May 11, 2024 · fb1ecf4 · fb1ecf4
2 parents ecc8144 + c237aa4
commit fb1ecf4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Clang
         uses: egor-tensin/setup-clang@v1
         with:
-          version: 17
+          version: 18
           platform: x64
 
       - name: Prepare compile_commands.json
@@ -39,7 +39,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           style: file
-          version: 17
+          version: 18
           database: build
           files-changed-only: ${{ github.event_name != 'workflow_dispatch' }}
           lines-changed-only: ${{ github.event_name != 'workflow_dispatch' }}

diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
@@ -105,11 +105,11 @@ jobs:
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
-          sudo apt-get install libc++-17* libc++abi*17* -y
-          echo "CC=clang-17" >> "$GITHUB_ENV"
-          echo "CXX=clang++-17" >> "$GITHUB_ENV"
-          echo "OBJC=clang-17" >> "$GITHUB_ENV"
+          sudo ./llvm.sh 18
+          sudo apt-get install libc++-18* libc++abi*18* -y
+          echo "CC=clang-18" >> "$GITHUB_ENV"
+          echo "CXX=clang++-18" >> "$GITHUB_ENV"
+          echo "OBJC=clang-18" >> "$GITHUB_ENV"
 
 
       - name: Setup GCC (Linux)
@@ -123,7 +123,7 @@ jobs:
         if: matrix.config.os == 'macos'
         run: |
           brew update
-          brew install llvm@17
+          brew install llvm@18
           echo "$(brew --prefix)/opt/llvm/bin" >> $GITHUB_PATH
           echo "LDFLAGS=-L$(brew --prefix)/opt/llvm/lib -L$(brew --prefix)/opt/llvm/lib/c++ -Wl,-rpath,$(brew --prefix)/opt/llvm/lib/c++" >> "$GITHUB_ENV"
           echo "CPPFLAGS=-I$(brew --prefix)/opt/llvm/include" >> "$GITHUB_ENV"
@@ -134,19 +134,10 @@ jobs:
           echo "CXX_LD=lld" >> "$GITHUB_ENV"
           echo "OBJC_LD=lld" >> "$GITHUB_ENV"
 
-      - name: Unbreak Python in GHA for 3.11 (MacOS 13 image)
-        if: matrix.config.os == 'macos'  &&  matrix.config.os-version == 13
-        run: |
-          # A workaround for "The `brew link` step did not complete successfully" error.
-          # See https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
-          find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
-          sudo rm -rf /Library/Frameworks/Python.framework/
-          brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
-
       - name: Setup meson (MacOS)
         if: matrix.config.os == 'macos' 
         run: |
-          brew update 
+          brew update
           brew install meson
   
       - name: Setup meson

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,10 +19,10 @@ jobs:
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
-          sudo apt-get install libc++-17* libc++abi*17* llvm-17 -y
-          echo "CC=clang-17" >> "$GITHUB_ENV"
-          echo "CXX=clang++-17" >> "$GITHUB_ENV"
+          sudo ./llvm.sh 18
+          sudo apt-get install libc++-18* libc++abi*18* llvm-18 -y
+          echo "CC=clang-18" >> "$GITHUB_ENV"
+          echo "CXX=clang++-18" >> "$GITHUB_ENV"
             
       - name: Setup meson
         run: |