CI tweaks

atlanticaccent · Dec 6, 2024 · b742efd · b742efd
1 parent f1ca890
commit b742efd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/linux_dynamic.yml b/.github/workflows/linux_dynamic.yml
@@ -32,24 +32,24 @@ jobs:
 
       - name: Install Dependencies
         run: sudo apt-get update; sudo apt-get install libarchive-dev libgtk-3-dev webkit2gtk-4.1 libgtksourceview-3.0-dev libayatana-appindicator3-dev
+      - name: Install cargo-packager
+        run: (cargo install cargo-packager || true)
 
       - uses: actions/checkout@v4
 
       - uses: r7kamura/rust-problem-matchers@v1
+      - name: Set build specific env vars
+        run: |
+          echo "CC=${HOMEBREW_PREFIX}/opt/llvm@18/bin/clang" >> "$GITHUB_ENV"
+          echo "CXX=${HOMEBREW_PREFIX}/opt/llvm@18/bin/clang++" >> "$GITHUB_ENV"
+          echo "AR=${HOMEBREW_PREFIX}/opt/llvm@18/bin/llvm-ar" >> "$GITHUB_ENV"
+          echo "CFLAGS=\"-flto=full -O3\"" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=\"-flto=full -O3\"" >> "$GITHUB_ENV"
+          echo "RUSTFLAGS=\"-Zshare-generics=true -Clinker=clang-18 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld-18\"" >> "$GITHUB_ENV"
       - name: Build
-        env:
-          CC: clang-18
-          CXX: clang++-18
-          AR: llvm-ar-18
-          CFLAGS: "-flto=full -O3"
-          CXXFLAGS: "-flto=full -O3"
-          RUSTFLAGS: "-Zshare-generics=true -Clinker=clang-18 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld-18"
         run: cargo build --release
       - name: Test
         run: cargo test --release --no-fail-fast --features="leaky-api" -- --nocapture
-
-      - name: Install cargo-packager
-        run: (cargo install cargo-packager || true)
       - name: Run cargo-packager
         run: cargo packager --release --formats appimage
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -32,15 +32,23 @@ jobs:
           brew unlink [email protected] || true
           brew install coreutils pkgconfig libarchive llvm@18
           echo PKG_CONFIG_PATH=$(brew ls libarchive | grep .pc$ | sed 's|/libarchive.pc||') >> $GITHUB_ENV
+      - name: Install cargo-packager
+        run: (cargo install cargo-packager || true)
 
+      - name: Set build specific env vars
+        run: |
+          echo "CC=${HOMEBREW_PREFIX}/opt/llvm@18/bin/clang" >> "$GITHUB_ENV"
+          echo "CXX=${HOMEBREW_PREFIX}/opt/llvm@18/bin/clang++" >> "$GITHUB_ENV"
+          echo "AR=${HOMEBREW_PREFIX}/opt/llvm@18/bin/llvm-ar" >> "$GITHUB_ENV"
+          echo "CFLAGS=\"-flto=full -O3\"" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=\"-flto=full -O3\"" >> "$GITHUB_ENV"
+          echo "RUSTFLAGS=\"-Zshare-generics=true -Clinker-plugin-lto -Clinker=$PWD/scripts/linker-shim.sh -Clink-arg=-fuse-ld=${HOMEBREW_PREFIX}/opt/llvm@18/bin/ld64.lld\"" >> "$GITHUB_ENV"
       - uses: r7kamura/rust-problem-matchers@v1
       - name: Build
-        run: ./scripts/ci.sh
+        run: cargo build --release
       - name: Test
-        run: cargo test --release --no-fail-fast --features="leaky-api" -- --nocapture
+        run: cargo test --release --features="leaky-api" -- --nocapture
 
-      - name: Install cargo-packager
-        run: (cargo install cargo-packager || true)
       - name: Run cargo-packager
         run: cargo packager --release --formats app
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -36,12 +36,12 @@ jobs:
       - name: Setup vcpkg
         run: |
           (cargo install cargo-vcpkg || true)
-          cargo vcpkg --verbose build --manifest-path .\moss\Cargo.toml
+          cargo vcpkg build --manifest-path .\moss\Cargo.toml
 
       - name: Build
         run: cargo build --release
       - name: Test
-        run: cargo test --release --no-fail-fast --features="leaky-api" -- --nocapture
+        run: cargo test --release --features="leaky-api" -- --nocapture
 
       - uses: actions/upload-artifact@v4
         with: