Reduce macos env setup

aws · May 31, 2024 · 082c120 · 082c120
1 parent ea3e210
commit 082c120
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 33 deletions.
diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -80,10 +80,6 @@ jobs:
           brew install llvm
           echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/opt/homebrew/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:
@@ -106,10 +102,6 @@ jobs:
           brew install llvm
           echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/opt/homebrew/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -1,4 +1,4 @@
-name: Deploy Documentation
+ame: Deploy Documentation
 on:
   push:
     branches:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -160,19 +160,12 @@ jobs:
           brew install llvm
           echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/opt/homebrew/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
+
       - if: ${{ matrix.os == 'macos-12' }}
         run: |
           brew install llvm
           echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/usr/local/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/usr/local/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/usr/local/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/usr/local/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/usr/local/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
 
       - name: Install NASM on Windows
         if: runner.os == 'Windows'

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -74,19 +74,11 @@ jobs:
           brew install llvm
           echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/opt/homebrew/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
       - if: ${{ matrix.os == 'macos-12' }}
         run: |
           brew install llvm
           echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/usr/local/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/usr/local/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/usr/local/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/usr/local/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/usr/local/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:
@@ -399,19 +391,11 @@ jobs:
           brew install llvm
           echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/opt/homebrew/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/opt/homebrew/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/opt/homebrew/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
       - if: ${{ matrix.os == 'macos-12' }}
         run: |
           brew install llvm
           echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'
           echo 'export LIBCLANG_PATH=/usr/local/opt/llvm' >> "$GITHUB_ENV"
-          echo 'export DYLD_LIBRARY_PATH="/usr/local/opt/llvm/lib:$DYLD_LIBRARY_PATH"' >> "$GITHUB_ENV"
-          echo 'export LDFLAGS="-L/usr/local/opt/llvm/lib $LD_FLAGS"' >> "$GITHUB_ENV"
-          echo 'export CPPFLAGS="-I/usr/local/opt/llvm/include $CPPFLAGS"' >> "$GITHUB_ENV"
-          echo 'export CFLAGS="-I/usr/local/opt/llvm/include $CFLAGS"' >> "$GITHUB_ENV"
       - name: Set Rust toolchain override
         run: rustup override set ${{ steps.toolchain.outputs.name }}
       - name: Install cargo-careful