?

FStarLang · Jan 6, 2025 · 98f3175 · 98f3175
1 parent 27c231c
commit 98f3175
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -24,30 +24,15 @@ jobs:
         with:
           path: FStar
 
-      # self-hosted runner already set up
-      # - uses: ocaml/setup-ocaml@v3
-      #   with:
-      #     ocaml-compiler: 4.14.2
-      # - name: Prepare
-      #   shell: powershell # somehow in bash we fail to build ocamlfind?
-      #   run: |
-      #     ./FStar/.scripts/get_fstar_z3.sh $HOME/bin
-      #     echo "PATH=$HOME/bin:$PATH" >> $GITHUB_ENV
-      #     opam install --deps-only FStar\fstar.opam
-
       - name: Set version
         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 && echo "There is a CR at the end of this line"
       - name: Build package
         shell: C:\cygwin64\bin\bash.exe --login '{0}'
         working-directory: FStar
         run: |
-          eval $(opam env) && 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 && echo "There is a CR at the end of this line"
       - uses: actions/upload-artifact@v4
         with:
           path: FStar\fstar-Windows_NT-x86_64.tar.gz