Remove the legacy macOS build

cisco · Oct 27, 2023 · 7a2d9b0 · 7a2d9b0
1 parent 1a1c542
commit 7a2d9b0
Showing 1 changed file with 54 additions and 69 deletions.
diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -50,78 +50,63 @@ jobs:
               ctest-target: test
             - os: macos-latest
               ctest-target: test
-              macosx-deployment-target: 10.12 # Note: Change when macos-latest changes
-            - os: macos-latest
-              ctest-target: test
-              macosx-deployment-target: 10.11
-
-    env:
-      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx-deployment-target }}
 
     steps:
-    - name: Vibe check
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    - run: |
+         git -C ${{ env.VCPKG_REPO }} rev-parse HEAD > vcpkg_commit.txt
+
+    - name: Restore Cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ github.workspace }}/build/cache
+        key: ${{ env.CACHE_VERSION }}-${{ env.CACHE_NAME }}-${{ matrix.os }}-${{ hashFiles('vcpkg_commit.txt', 'alternatives/*/vcpkg.json') }}-${{ matrix.macosx-deployment-target }}
+        restore-keys: |
+          ${{ env.CACHE_VERSION }}-${{ env.CACHE_NAME }}-${{ matrix.os }}
+
+    - name: Dependencies (macOs)
+      if: ${{ matrix.os == 'macos-latest' }}
       run: |
-          echo "matrix.os = ${{ matrix.os }}"
-          echo "matrix.crypto = ${{ matrix.crypto }}"
-          echo "matrix.macosx-deployment-target = ${{ matrix.macosx-deployment-target }}"
-          echo "MACOSX_DEPLOYMENT_TARGET = ${MACOSX_DEPLOYMENT_TARGET}"
+        brew install llvm pkg-config nasm
+        ln -s "/usr/local/opt/llvm/bin/clang-format" "/usr/local/bin/clang-format"
+        ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy"
 
-#    - name: Checkout repository and submodules
-#      uses: actions/checkout@v4
-#      with:
-#        submodules: recursive
-#        fetch-depth: 0
-#
-#    - run: |
-#         git -C ${{ env.VCPKG_REPO }} rev-parse HEAD > vcpkg_commit.txt
-#
-#    - name: Restore Cache
-#      uses: actions/cache@v3
-#      with:
-#        path: ${{ github.workspace }}/build/cache
-#        key: ${{ env.CACHE_VERSION }}-${{ env.CACHE_NAME }}-${{ matrix.os }}-${{ hashFiles('vcpkg_commit.txt', 'alternatives/*/vcpkg.json') }}-${{ matrix.macosx-deployment-target }}
-#        restore-keys: |
-#          ${{ env.CACHE_VERSION }}-${{ env.CACHE_NAME }}-${{ matrix.os }}
-#
-#    - name: Dependencies (macOs)
-#      if: ${{ matrix.os == 'macos-latest' }}
-#      run: |
-#        brew install llvm pkg-config nasm
-#        ln -s "/usr/local/opt/llvm/bin/clang-format" "/usr/local/bin/clang-format"
-#        ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy"
-#
-#    - name: Dependencies (Ubuntu)
-#      if: ${{ matrix.os == 'ubuntu-latest' }}
-#      run: |
-#        sudo apt-get install -y linux-headers-$(uname -r) nasm
-#
-#    - name: Build
-#      run: |
-#        cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DTESTING=ON -DCLANG_TIDY=ON -DSANITIZERS=ON -DVCPKG_MANIFEST_DIR="alternatives/${{ matrix.crypto }}"
-#        cmake --build "${{ env.CMAKE_BUILD_DIR }}"
-#
-#    - name: Unit Test
-#      run: |
-#        cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target "${{ matrix.ctest-target}}"
-#
-#    - name: Build (Interop Harness)
-#      run: |
-#        cd cmd/interop
-#        cmake -B build
-#        cmake --build build
-#
-#    - name: Test self-interop
-#      run: |
-#        make -C cmd/interop self-test
-#
-#    - name: Test interop on test vectors
-#      run: |
-#        make -C cmd/interop interop-test
-#
-#    - name: Test gRPC live interop with self
-#      run: |
-#        cd cmd/interop
-#        ./grpc-self-test.sh
+    - name: Dependencies (Ubuntu)
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: |
+        sudo apt-get install -y linux-headers-$(uname -r) nasm
+
+    - name: Build
+      run: |
+        cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DTESTING=ON -DCLANG_TIDY=ON -DSANITIZERS=ON -DVCPKG_MANIFEST_DIR="alternatives/${{ matrix.crypto }}"
+        cmake --build "${{ env.CMAKE_BUILD_DIR }}"
+
+    - name: Unit Test
+      run: |
+        cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target "${{ matrix.ctest-target}}"
+
+    - name: Build (Interop Harness)
+      run: |
+        cd cmd/interop
+        cmake -B build
+        cmake --build build
+
+    - name: Test self-interop
+      run: |
+        make -C cmd/interop self-test
+
+    - name: Test interop on test vectors
+      run: |
+        make -C cmd/interop interop-test
+
+    - name: Test gRPC live interop with self
+      run: |
+        cd cmd/interop
+        ./grpc-self-test.sh
 
-# TODO: Add the legacy macOS build to the main matrix
 # TODO: Add a clang-tidy build