Restructure for flang 19

pymt-lab · Dec 19, 2024 · 20a8f4f · 20a8f4f
1 parent 66e102e
commit 20a8f4f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -73,26 +73,28 @@ jobs:
         with:
           micromamba-version: latest
           environment-file: environment.yml
+          init-shell: >-
+            powershell
 
       - name: Set the PREFIX environment variable
         run: |
           echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld\Library" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Set the FC environment variable
         run: |
-          echo "FC=$env:PREFIX\bin\flang.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "FC=$env:PREFIX\bin\flang-new.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      - name: Make a LINKER environment variable
-        run: |
-          echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      # - name: Make a LINKER environment variable
+      #   run: |
+      #     echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: View environment variables
         run: |
           ls env:
 
       - name: Configure, build, and install HeatModelF
         run: |
-          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_LINKER="${{ env.LINKER }}" -DCMAKE_BUILD_TYPE=Release
+          cmake ./external/bmi-example-fortran -B ${{ env.BUILD_DIR }} -LA -G Ninja -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} -DCMAKE_BUILD_TYPE=Release
           cmake --build ${{ env.BUILD_DIR }} --target install --config Release
 
       - name: Build and install package