fix(ci): properly utilize the installed version of clang

nvim-neorocks · Apr 15, 2024 · 44e485b · 44e485b
1 parent 9fd3725
commit 44e485b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build-macosx-aarch64.yml b/.github/workflows/build-macosx-aarch64.yml
@@ -21,6 +21,7 @@ jobs:
         with:
           ref: ${{ github.ref }}
       - name: Install C/C++ Compiler
+        id: install_cc
         uses: rlalik/setup-cpp-compiler@master
         with:
           compiler: clang-latest
@@ -63,11 +64,11 @@ jobs:
           luarocks --verbose pack tree-sitter-orgmode
       - name: "[HACK]: Set default compiler flags for MacOS systems"
         run: |
-          luarocks config --scope=system -- variables.LIBFLAG "-bundle -undefined dynamic_lookup -all_load -std=c++11"
+          luarocks config --lua-version=5.1 --scope=system -- variables.LIBFLAG "-bundle -undefined dynamic_lookup -all_load -std=c++11"
       - name: Install `tree-sitter-norg` Package
         env:
-          CC: clang
-          CXX: clang++
+          CC: ${{ steps.install_cc.outputs.cc }}
+          CXX: ${{ steps.install_cc.outputs.cxx }}
         run: |
           luarocks --verbose --local --lua-version=5.1 install tree-sitter-norg
           luarocks --verbose pack tree-sitter-norg

diff --git a/.github/workflows/build-macosx-x86_64.yml b/.github/workflows/build-macosx-x86_64.yml
@@ -21,6 +21,7 @@ jobs:
         with:
           ref: ${{ github.ref }}
       - name: Install C/C++ Compiler
+        id: install_cc
         uses: rlalik/setup-cpp-compiler@master
         with:
           compiler: clang-latest
@@ -63,11 +64,11 @@ jobs:
           luarocks --verbose pack tree-sitter-orgmode
       - name: "[HACK]: Set default compiler flags for MacOS systems"
         run: |
-          luarocks config --scope=system -- variables.LIBFLAG "-bundle -undefined dynamic_lookup -all_load -std=c++11"
+          luarocks config --lua-version=5.1 --scope=system -- variables.LIBFLAG "-bundle -undefined dynamic_lookup -all_load -std=c++11"
       - name: Install `tree-sitter-norg` Package
         env:
-          CC: clang
-          CXX: clang++
+          CC: ${{ steps.install_cc.outputs.cc }}
+          CXX: ${{ steps.install_cc.outputs.cxx }}
         run: |
           luarocks --verbose --local --lua-version=5.1 install tree-sitter-norg
           luarocks --verbose pack tree-sitter-norg