upd

FStarLang · Jan 6, 2025 · 27c231c · 27c231c
1 parent b4f1974
commit 27c231c
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -7,11 +7,11 @@ on:
   workflow_dispatch:
   push:
 
-defaults:
-  run:
-    shell:
-      bash
-      # ^ avoid powershell!
+# defaults:
+#   run:
+#     shell:
+#       bash
+#       # ^ avoid powershell!
 
 jobs:
   build-windows:
@@ -36,23 +36,17 @@ jobs:
       #     opam install --deps-only FStar\fstar.opam
 
       - name: Set version
-        #shell: C:\cygwin64\bin\bash.exe --login '{0}'
+        shell: C:\cygwin64\bin\bash.exe --login '{0}'
         run: |
           # Setting FSTAR_VERSION for nightly and release builds. If unset,
           # we use $(version.txt)~dev. Setting it avoids the ~dev.
-          if [[ "${{github.workflow_ref}}" =~ "nightly.yml" ]]; then
-            echo FSTAR_VERSION="nightly-$(date -I)" >> $GITHUB_ENV
-          elif [[ "${{github.workflow_ref}}" =~ "release.yml" ]]; then
-            echo FSTAR_VERSION="$(cat FStar/version.txt)" >> $GITHUB_ENV
-          fi
+          if [[ "${{github.workflow_ref}}" =~ "nightly.yml" ]]; then echo FSTAR_VERSION="nightly-$(date -I)" >> $GITHUB_ENV; elif [[ "${{github.workflow_ref}}" =~ "release.yml" ]]; then echo FSTAR_VERSION="$(cat FStar/version.txt)" >> $GITHUB_ENV; fi
 
       - name: Build package
         shell: C:\cygwin64\bin\bash.exe --login '{0}'
         working-directory: FStar
         run: |
-          eval $(opam env)
-          export CC=x86_64-w64-mingw32-gcc.exe
-          make -skj$(nproc) package FSTAR_TAG=-Windows_NT-x86_64 V=1
+          eval $(opam env) && CC=x86_64-w64-mingw32-gcc.exe make -skj$(nproc) package FSTAR_TAG=-Windows_NT-x86_64 V=1
 
       - uses: actions/upload-artifact@v4
         with: