tmp

tobil4sk · Dec 7, 2024 · 6f97058 · 6f97058
1 parent b38c6d9
commit 6f97058
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,10 +18,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Use GNU Tar from msys
-        run: |
-          echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          rm C:\msys64\usr\bin\bash.exe
+      # - name: Use GNU Tar from msys
+      #   run: |
+      #     echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      #     rm C:\msys64\usr\bin\bash.exe
 
       - name: choco install nsis
         uses: nick-invision/retry@v3
@@ -58,14 +58,12 @@ jobs:
             haxe.opam
 
       - name: Install dependencies
-        shell: ${{ env.CYG_ROOT }}/bin/bash.exe -lc {0}
         env:
           MBEDTLS_VERSION: 2.16.3
         run: |
-          set -ex
-          curl.exe -fsSL -o "libmbedtls.tar.xz" --retry 3 `
-            https://github.com/Simn/mingw64-mbedtls/releases/download/${{ env.MBEDTLS_VERSION }}/mingw64-$($env:MINGW_ARCH)-mbedtls-${{ env.MBEDTLS_VERSION }}-1.tar.xz
-          tar -C / -xvf libmbedtls.tar.xz
+          curl.exe -fsSL -o "libmbedtls.tar.xz" --retry 3 \
+            https://github.com/Simn/mingw64-mbedtls/releases/download/${{ env.MBEDTLS_VERSION }}/mingw64-${{ env.MINGW_ARCH }}-mbedtls-${{ env.MBEDTLS_VERSION }}-1.tar.xz
+          ${{ env.CYG_ROOT }}/bin/tar.exe -C ${{ env.CYG_ROOT }} -xvf libmbedtls.tar.xz
 
       - name: Install OCaml libraries
         shell: pwsh
@@ -93,11 +91,11 @@ jobs:
       - name: Build Haxe
         shell: pwsh
         run: |
-          opam exec -- ${{ env.CYGROOT }}/bin/make -s -f Makefile.win -j$env:NUMBER_OF_PROCESSORS haxe
-          opam exec -- ${{ env.CYGROOT }}/bin/make -s -f Makefile.win haxelib
-          opam exec -- ${{ env.CYGROOT }}/bin/make -f Makefile.win echo_package_files package_bin package_installer_win package_choco
-          ${{ env.CYGROOT }}/bin/cygcheck ./haxe.exe
-          ${{ env.CYGROOT }}/bin/cygcheck ./haxelib.exe
+          opam exec -- ${{ env.CYG_ROOT }}/bin/make -s -f Makefile.win -j$env:NUMBER_OF_PROCESSORS haxe
+          opam exec -- ${{ env.CYG_ROOT }}/bin/make -s -f Makefile.win haxelib
+          opam exec -- ${{ env.CYG_ROOT }}/bin/make -f Makefile.win echo_package_files package_bin package_installer_win package_choco
+          ${{ env.CYG_ROOT }}/bin/cygcheck ./haxe.exe
+          ${{ env.CYG_ROOT }}/bin/cygcheck ./haxelib.exe
           ls ./out
 
       - name: Check artifact

diff --git a/extra/github-actions/build-windows.yml b/extra/github-actions/build-windows.yml
@@ -17,11 +17,11 @@
 - name: Build Haxe
   shell: pwsh
   run: |
-    opam exec -- ${{ env.CYGROOT }}/bin/make -s -f Makefile.win -j$env:NUMBER_OF_PROCESSORS haxe
-    opam exec -- ${{ env.CYGROOT }}/bin/make -s -f Makefile.win haxelib
-    opam exec -- ${{ env.CYGROOT }}/bin/make -f Makefile.win echo_package_files package_bin package_installer_win package_choco
-    ${{ env.CYGROOT }}/bin/cygcheck ./haxe.exe
-    ${{ env.CYGROOT }}/bin/cygcheck ./haxelib.exe
+    opam exec -- ${{ env.CYG_ROOT }}/bin/make -s -f Makefile.win -j$env:NUMBER_OF_PROCESSORS haxe
+    opam exec -- ${{ env.CYG_ROOT }}/bin/make -s -f Makefile.win haxelib
+    opam exec -- ${{ env.CYG_ROOT }}/bin/make -f Makefile.win echo_package_files package_bin package_installer_win package_choco
+    ${{ env.CYG_ROOT }}/bin/cygcheck ./haxe.exe
+    ${{ env.CYG_ROOT }}/bin/cygcheck ./haxelib.exe
     ls ./out
 
 - name: Check artifact

diff --git a/extra/github-actions/install-ocaml-windows64.yml b/extra/github-actions/install-ocaml-windows64.yml
@@ -6,11 +6,9 @@
       haxe.opam
 
 - name: Install dependencies
-  shell: ${{ env.CYG_ROOT }}/bin/bash.exe -lc {0}
   env:
     MBEDTLS_VERSION: 2.16.3
   run: |
-    set -ex
-    curl.exe -fsSL -o "libmbedtls.tar.xz" --retry 3 `
-      https://github.com/Simn/mingw64-mbedtls/releases/download/${{ env.MBEDTLS_VERSION }}/mingw64-$($env:MINGW_ARCH)-mbedtls-${{ env.MBEDTLS_VERSION }}-1.tar.xz
-    tar -C / -xvf libmbedtls.tar.xz
+    curl.exe -fsSL -o "libmbedtls.tar.xz" --retry 3 \
+      https://github.com/Simn/mingw64-mbedtls/releases/download/${{ env.MBEDTLS_VERSION }}/mingw64-${{ env.MINGW_ARCH }}-mbedtls-${{ env.MBEDTLS_VERSION }}-1.tar.xz
+    ${{ env.CYG_ROOT }}/bin/tar.exe -C ${{ env.CYG_ROOT }} -xvf libmbedtls.tar.xz
diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
@@ -17,10 +17,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Use GNU Tar from msys
-        run: |
-          echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          rm C:\msys64\usr\bin\bash.exe
+      # - name: Use GNU Tar from msys
+      #   run: |
+      #     echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      #     rm C:\msys64\usr\bin\bash.exe
 
       @import install-nsis.yml
       @import install-neko-windows.yml