Fix ansible

.github/workflows/ci-macos.yml

@@ -1,4 +1,4 @@
-name: macOS 11 CI
+name: macOS CI
 
 env:
   CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
@@ -15,7 +15,7 @@ on:
 jobs:
   macos-11:
     name: LLVM ${{ matrix.LLVM_VERSION }}
-    runs-on: macos-12
+    runs-on: macos-latest
     strategy:
       matrix:
         LLVM_VERSION: [12, 13, 14, 16]
@@ -40,7 +40,7 @@ jobs:
 
       - name: Run CI task
         run: |
-          pip3 install ansible
+          brew install ansible
           cd infrastructure && \
           ansible-playbook macos-playbook.yaml \
             -e llvm_version="${{ matrix.LLVM_VERSION }}" \

infrastructure/helpers/build-mull.yaml

@@ -1,4 +1,9 @@
 ---
+- name: Install Python dependencies
+  pip:
+    requirements: "{{ source_dir }}/requirements.txt"
+    executable: pip3
+
 - name: Clone Mull's sources
   git:
     repo: "{{ repo_url }}"

infrastructure/helpers/variables.yaml

@@ -7,35 +7,35 @@ SDKROOT: /
 llvm_mapping:
   macos:
     "16":
-      cmake_search_paths: "/usr/local/opt/llvm@16/lib/cmake/llvm/;/usr/local/opt/llvm@16/lib/cmake/clang/"
+      cmake_search_paths: "/opt/homebrew/opt/llvm@16/lib/cmake/llvm/;/opt/homebrew/opt/llvm@16/lib/cmake/clang/"
       packages:
         - llvm@16
-      cmake_cc: /usr/local/opt/llvm@16/bin/clang
-      cmake_cxx: /usr/local/opt/llvm@16/bin/clang++
+      cmake_cc: /opt/homebrew/opt/llvm@16/bin/clang
+      cmake_cxx: /opt/homebrew/opt/llvm@16/bin/clang++
     "15":
-      cmake_search_paths: "/usr/local/opt/llvm@15/lib/cmake/llvm/;/usr/local/opt/llvm@15/lib/cmake/clang/"
+      cmake_search_paths: "/opt/homebrew/opt/llvm@15/lib/cmake/llvm/;/opt/homebrew/opt/llvm@15/lib/cmake/clang/"
       packages:
         - llvm@15
-      cmake_cc: /usr/local/opt/llvm@15/bin/clang
-      cmake_cxx: /usr/local/opt/llvm@15/bin/clang++
+      cmake_cc: /opt/homebrew/opt/llvm@15/bin/clang
+      cmake_cxx: /opt/homebrew/opt/llvm@15/bin/clang++
     "14":
-      cmake_search_paths: "/usr/local/opt/llvm@14/lib/cmake/llvm/;/usr/local/opt/llvm@14/lib/cmake/clang/"
+      cmake_search_paths: "/opt/homebrew/opt/llvm@14/lib/cmake/llvm/;/opt/homebrew/opt/llvm@14/lib/cmake/clang/"
       packages:
         - llvm@14
-      cmake_cc: /usr/local/opt/llvm@14/bin/clang
-      cmake_cxx: /usr/local/opt/llvm@14/bin/clang++
+      cmake_cc: /opt/homebrew/opt/llvm@14/bin/clang
+      cmake_cxx: /opt/homebrew/opt/llvm@14/bin/clang++
     "13":
-      cmake_search_paths: "/usr/local/opt/llvm@13/lib/cmake/llvm/;/usr/local/opt/llvm@13/lib/cmake/clang/"
+      cmake_search_paths: "/opt/homebrew/opt/llvm@13/lib/cmake/llvm/;/opt/homebrew/opt/llvm@13/lib/cmake/clang/"
       packages:
         - llvm@13
-      cmake_cc: /usr/local/opt/llvm@13/bin/clang
-      cmake_cxx: /usr/local/opt/llvm@13/bin/clang++
+      cmake_cc: /opt/homebrew/opt/llvm@13/bin/clang
+      cmake_cxx: /opt/homebrew/opt/llvm@13/bin/clang++
     "12":
-      cmake_search_paths: "/usr/local/opt/llvm@12/lib/cmake/llvm/;/usr/local/opt/llvm@12/lib/cmake/clang/"
+      cmake_search_paths: "/opt/homebrew/opt/llvm@12/lib/cmake/llvm/;/opt/homebrew/opt/llvm@12/lib/cmake/clang/"
       packages:
         - llvm@12
-      cmake_cc: /usr/local/opt/llvm@12/bin/clang
-      cmake_cxx: /usr/local/opt/llvm@12/bin/clang++
+      cmake_cc: /opt/homebrew/opt/llvm@12/bin/clang
+      cmake_cxx: /opt/homebrew/opt/llvm@12/bin/clang++
 
   ubuntu:
     "15":

infrastructure/macos-playbook.yaml

@@ -14,20 +14,17 @@
     mull_cxx_flags: ""
 
     packages:
-      - cmake
       - zlib
       - ncurses
       - sqlite
       - ninja
-      - gnu-tar
-      - python3
 
   vars_files:
     - helpers/variables.yaml
 
   tasks:
     - name: Prepare Working Directory
-      include: helpers/working-directory.yaml
+      include_tasks: helpers/working-directory.yaml
 
     - name: Install Required Packages
       homebrew:
@@ -39,25 +36,11 @@
         name: "{{ llvm_packages }}"
         state: present
 
-    - name: Install Python dependencies
-      pip:
-        name:
-          - lit==16.0.1
-          - filecheck==0.0.23
-          - cloudsmith-cli==0.42.0
-        executable: pip3
-
-    - name: Create a symbolic link for gnu-tar
-      file:
-        src: /usr/local/bin/gtar
-        dest: /usr/local/bin/tar
-        state: link
-
     - name: Build Mull
-      include: helpers/build-mull.yaml
+      include_tasks: helpers/build-mull.yaml
 
     - name: LIT Tests
-      include: helpers/lit-tests.yaml
+      include_tasks: helpers/lit-tests.yaml
 
     - name: Integration Tests
-      include: helpers/integration-tests.yaml
+      include_tasks: helpers/integration-tests.yaml

infrastructure/ubuntu-playbook.yaml

@@ -30,7 +30,7 @@
 
   tasks:
     - name: Prepare Working Directory
-      include: helpers/working-directory.yaml
+      include_tasks: helpers/working-directory.yaml
 
     - name: Install Required Packages
       apt:
@@ -44,19 +44,11 @@
         state: present
       become: true
 
-    - name: Install Python dependencies
-      pip:
-        name:
-          - lit==16.0.1
-          - filecheck==0.0.23
-          - cloudsmith-cli==0.42.0
-        executable: pip3
-
     - name: Build Mull
-      include: helpers/build-mull.yaml
+      include_tasks: helpers/build-mull.yaml
 
     - name: LIT Tests
-      include: helpers/lit-tests.yaml
+      include_tasks: helpers/lit-tests.yaml
 
     - name: Integration Tests
-      include: helpers/integration-tests.yaml
+      include_tasks: helpers/integration-tests.yaml

requirements.txt

@@ -0,0 +1,3 @@
+lit==18.1.4
+filecheck==0.0.24
+cloudsmith-cli==1.2.3