From 51ee3812fb294605872d9625aa6bb6f2067308ca Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 30 Jul 2025 22:17:08 +0200 Subject: [PATCH 1/5] Update to 20.1.8 --- .github/workflows/windows_arm64.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows_arm64.yml b/.github/workflows/windows_arm64.yml index d1b5f94e0e..72ecf79f1a 100644 --- a/.github/workflows/windows_arm64.yml +++ b/.github/workflows/windows_arm64.yml @@ -4,11 +4,9 @@ on: push: branches: - develop - - release-** pull_request: branches: - develop - - release-** concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -28,7 +26,7 @@ jobs: - name: Install LLVM for Win-ARM64 shell: pwsh run: | - Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.6/LLVM-20.1.6-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe + Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.8/LLVM-20.1.8-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append From c77aec6971b433155ef975b47471ab0522a757a7 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 8 Aug 2025 11:04:35 +0200 Subject: [PATCH 2/5] Update windows_arm64.yml --- .github/workflows/windows_arm64.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows_arm64.yml b/.github/workflows/windows_arm64.yml index 72ecf79f1a..9fc644fba8 100644 --- a/.github/workflows/windows_arm64.yml +++ b/.github/workflows/windows_arm64.yml @@ -29,6 +29,7 @@ jobs: Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.8/LLVM-20.1.8-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + dir "C:\Program Files\LLVM\include\flang" - name: Install CMake and Ninja for Win-ARM64 shell: pwsh From 599e4e372199eea8cb3ac7e9893ae2352d32b150 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 8 Aug 2025 11:55:27 +0200 Subject: [PATCH 3/5] add modules search path --- .github/workflows/windows_arm64.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows_arm64.yml b/.github/workflows/windows_arm64.yml index 9fc644fba8..0642eb2273 100644 --- a/.github/workflows/windows_arm64.yml +++ b/.github/workflows/windows_arm64.yml @@ -54,6 +54,7 @@ jobs: -DBINARY=64 ^ -DCMAKE_C_COMPILER=clang-cl ^ -DCMAKE_Fortran_COMPILER=flang-new ^ + -DCMAKE_Fortran_FLAGS=-fintrinsic-modules-path C:/Program\ Files/LLVM/include/flang ^ -DBUILD_SHARED_LIBS=ON ^ -DCMAKE_SYSTEM_PROCESSOR=arm64 ^ -DCMAKE_SYSTEM_NAME=Windows ^ From 1aed477ee248c7a2eb0758e70b5f1b76316fadac Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 8 Aug 2025 14:06:20 +0200 Subject: [PATCH 4/5] Update windows_arm64.yml --- .github/workflows/windows_arm64.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows_arm64.yml b/.github/workflows/windows_arm64.yml index 0642eb2273..adfb1fefcf 100644 --- a/.github/workflows/windows_arm64.yml +++ b/.github/workflows/windows_arm64.yml @@ -29,8 +29,9 @@ jobs: Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.8/LLVM-20.1.8-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - dir "C:\Program Files\LLVM\include\flang" - + #dir "C:\Program Files\LLVM\include\flang" + #rmdir /Q /S "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/ARM64" + - name: Install CMake and Ninja for Win-ARM64 shell: pwsh run: | @@ -46,6 +47,8 @@ jobs: shell: cmd run: | CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat" + set PATH=C:\Program Files\LLVM\bin;%PATH% + mkdir build cd build cmake .. -G Ninja ^ From fbefd2a526ac8a7a6e1776e878cef5c11b09aa54 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Fri, 8 Aug 2025 14:34:09 +0200 Subject: [PATCH 5/5] Update windows_arm64.yml --- .github/workflows/windows_arm64.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows_arm64.yml b/.github/workflows/windows_arm64.yml index adfb1fefcf..21043ec251 100644 --- a/.github/workflows/windows_arm64.yml +++ b/.github/workflows/windows_arm64.yml @@ -57,7 +57,6 @@ jobs: -DBINARY=64 ^ -DCMAKE_C_COMPILER=clang-cl ^ -DCMAKE_Fortran_COMPILER=flang-new ^ - -DCMAKE_Fortran_FLAGS=-fintrinsic-modules-path C:/Program\ Files/LLVM/include/flang ^ -DBUILD_SHARED_LIBS=ON ^ -DCMAKE_SYSTEM_PROCESSOR=arm64 ^ -DCMAKE_SYSTEM_NAME=Windows ^