Use cygwin tar

tobil4sk · Dec 11, 2024 · 035210f · 035210f
1 parent 3b74dfb
commit 035210f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,11 +18,6 @@ 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: choco install nsis
         uses: nick-invision/retry@v3
         with:

diff --git a/extra/github-actions/install-ocaml-windows.yml b/extra/github-actions/install-ocaml-windows.yml
@@ -15,4 +15,4 @@
   run: |
     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.exe -C ${{ env.CYG_ROOT }} -xvf libmbedtls.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,11 +17,6 @@ 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
-
       @import install-nsis.yml
       @import install-neko-windows.yml
       @import install-ocaml-windows.yml