ci

Author: ghaith

.github/workflows/windows.yml

@@ -13,23 +13,24 @@ jobs:
   build:
     name: Windows Build
     runs-on: windows-2022
-    env:
-      toolchain-version: 1.90.0
-      llvm-version: 14.0.6
     steps:
 
       - uses: actions/checkout@v3
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.toolchain-version }}
+          toolchain: 1.90.0
 
       - name: Install LLVM
-        uses: ghaith/install-llvm-action@latest
-        with:
-          version: ${{ env.llvm-version }}
-          directory: "./llvm"
+        shell: pwsh
+        run: |
+          $llvmUrl = "https://github.com/PLC-lang/llvm-package-windows/releases/download/v21.1.7/LLVM-21.1.7-win64.7z"
+          $llvmArchive = "LLVM-21.1.7-win64.7z"
+          Invoke-WebRequest -Uri $llvmUrl -OutFile $llvmArchive
+          7z x $llvmArchive -o"./llvm" -y
+          $llvmBin = (Resolve-Path "./llvm/bin").Path
+          echo "$llvmBin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: Cargo test (Unit)
         run: cargo test --lib -- --nocapture
@@ -47,4 +48,3 @@ jobs:
         with:
           name: plc.exe
           path: target/release/plc.exe
-

Cargo.lock

@@ -83,8 +83,13 @@ members = [
 default-members = [".", "compiler/plc_driver", "compiler/plc_xml"]
 
 [workspace.dependencies]
+# TODO: Version 0.7 and LLVM 21 are incompatible because of https://github.com/TheDan64/inkwell/pull/628.
+# We should however move to 0.8 once released, and remove the git version dependency
+inkwell = { git = "https://github.com/TheDan64/inkwell.git", rev = "7abf48a2cf4fc3e338fbeb1780ac7507cbb13e98", features = [
+    "llvm21-1",
+] }
+
 insta = { version = "1.31.0", features = ["filters"] }
-inkwell = { version = "0.7", features = ["llvm21-1"] }
 encoding_rs = "0.8"
 encoding_rs_io = "0.1"
 log = "0.4"

Cargo.toml

@@ -17,4 +17,4 @@ print(f'Compile command: {compile}')
 
 config.substitutions.append(('%COMPILE', f'{compile}'))
 config.substitutions.append(('%RUN', f'LD_LIBRARY_PATH="{stdlibLocation}/lib" /tmp/%basename_t.out'))
-config.substitutions.append(('%CHECK', f'FileCheck-15 --check-prefixes CHECK --allow-unused-prefixes --match-full-lines'))
+config.substitutions.append(('%CHECK', f'FileCheck-21 --check-prefixes CHECK --allow-unused-prefixes --match-full-lines'))