removing curl + levainBootstrap

jmoalves · Mar 20, 2024 · 7921093 · 7921093
1 parent 51c495a
commit 7921093
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 197 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -129,14 +129,6 @@ jobs:
         env:
           LEVAIN_RELEASE_SRC_PATH: ${{ runner.temp }}/src/levain-${{ env.RELEASE_VERSION }}
 
-      - name: Levain bootstrap
-        run: |
-          bash $GITHUB_WORKSPACE/githubScripts/levain-bootstrap.sh $LEVAIN_RELEASE_SRC_PATH $LEVAIN_RELEASE_BIN_PATH $RUNNER_TEMP/levainBootstrap-windows-x86_64.zip
-        env:
-          LEVAIN_VERSION: ${{ env.RELEASE_VERSION }} 
-          LEVAIN_RELEASE_SRC_PATH: ${{ runner.temp }}/src/levain-${{ env.RELEASE_VERSION }}
-          LEVAIN_RELEASE_BIN_PATH: ${{ runner.temp }}/bin/levain-${{ env.RELEASE_VERSION }}
-
       - name: Levain package
         run: |
           bash $GITHUB_WORKSPACE/githubScripts/levain-package.sh $LEVAIN_RELEASE_BIN_PATH $RUNNER_TEMP/levain-windows-x86_64.zip STRIP
@@ -273,28 +265,6 @@ jobs:
           asset_name: levain-extra-bin-windows-x86_64.zip.sha256
           asset_content_type: text/plain
 
-      - name: Upload asset - levainBootstrap-windows-x86_64.zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LEVAIN_VERSION: ${{ env.RELEASE_VERSION }} 
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ runner.temp }}/levainBootstrap-windows-x86_64.zip
-          asset_name: levainBootstrap-windows-x86_64.zip
-          asset_content_type: application/zip
-
-      - name: Upload asset - levainBootstrap-windows-x86_64.zip.sha256
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LEVAIN_VERSION: ${{ env.RELEASE_VERSION }} 
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ runner.temp }}/levainBootstrap-windows-x86_64.zip.sha256
-          asset_name: levainBootstrap-windows-x86_64.zip.sha256
-          asset_content_type: text/plain
-
       - name: Upload asset - install.ps1
         uses: actions/upload-release-asset@v1
         env:

diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@ cannot_read_this_folder
 levain.bundle.js
 /coverage
 /extra-bin/windows/7-zip/
-/extra-bin/windows/curl/
 /extra-bin/windows/git/
 /node_modules/
 deno.lock

diff --git a/bootstrap/levainBootstrap.cmd b/bootstrap/levainBootstrap.cmd
diff --git a/githubScripts/clean-levain-release.sh b/githubScripts/clean-levain-release.sh
@@ -8,7 +8,6 @@ if [ ! -d "$levainDir"]; then
     exit 1
 fi
 
-rm -rvf ${levainDir}/bootstrap &&
 rm -rvf ${levainDir}/ci &&
 rm -rvf ${levainDir}/githubScripts &&
 rm -rvf ${levainDir}/install &&

diff --git a/githubScripts/get-extraBin.cmd b/githubScripts/get-extraBin.cmd
@@ -24,7 +24,6 @@ mkdir %binPath%
 %PWS% Invoke-WebRequest %proxyCfg% https://github.com/jmoalves/levain/releases/latest/download/levain-extra-bin-windows-x86_64.zip -OutFile %binPath%\levain-extra-bin-windows-x86_64.zip
 
 if exist %levainRoot%\extra-bin\windows\7-zip rmdir /q /s %levainRoot%\extra-bin\windows\7-zip
-if exist %levainRoot%\extra-bin\windows\curl rmdir /q /s %levainRoot%\extra-bin\windows\curl
 if exist %levainRoot%\extra-bin\windows\git rmdir /q /s %levainRoot%\extra-bin\windows\git
 %PWS% Expand-Archive %binPath%\levain-extra-bin-windows-x86_64.zip -DestinationPath %levainRoot%
 rmdir /q /s %binPath%

diff --git a/githubScripts/levain-bootstrap.sh b/githubScripts/levain-bootstrap.sh
diff --git a/githubScripts/levain-embedded-binaries.sh b/githubScripts/levain-embedded-binaries.sh
@@ -80,14 +80,6 @@ tar xf ${zipDir}/7z.tar.xz --xz -C ${zipDir}
 zipTool=${zipDir}/7zzs
 
 
-# EXTRA-BIN: curl
-curlUrl=https://curl.se/windows/dl-8.6.0_2/curl-8.6.0_2-win64-mingw.zip
-curlDir=${levainDir}/extra-bin/windows/curl
-
-echo
-downloadBinary -i curl -u $curlUrl -d $curlDir -s
-
-
 # EXTRA-BIN: git
 gitUrl=https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/MinGit-2.44.0-64-bit.zip
 gitDir=${levainDir}/extra-bin/windows/git

diff --git a/scripts/devLevain.cmd b/scripts/devLevain.cmd
@@ -34,7 +34,6 @@ mkdir %binPath%
 %PWS% Invoke-WebRequest %proxyCfg% https://github.com/jmoalves/levain/releases/latest/download/levain-extra-bin-windows-x86_64.zip -OutFile %binPath%\levain-extra-bin-windows-x86_64.zip
 
 if exist %levainRoot%\extra-bin\windows\7-zip rmdir /q /s %levainRoot%\extra-bin\windows\7-zip
-if exist %levainRoot%\extra-bin\windows\curl rmdir /q /s %levainRoot%\extra-bin\windows\curl
 if exist %levainRoot%\extra-bin\windows\git rmdir /q /s %levainRoot%\extra-bin\windows\git
 %PWS% Expand-Archive %binPath%\levain-extra-bin-windows-x86_64.zip -DestinationPath %levainRoot%
 rmdir /q /s %binPath%

diff --git a/src/cmd/clean.ts b/src/cmd/clean.ts
@@ -189,8 +189,6 @@ export default class CleanCommand implements Command {
 
         const levainReleasesDir = path.resolve(tempDir, 'levain')
         if (existsSync(levainReleasesDir)) {
-            // levainBootstrap.com
-
             size += this.cleanDir(levainReleasesDir, (dirEntry:any) => {
                 if (dirEntry.name.match(`^levain-${LevainVersion.levainVersion.versionNumber}$`)) {
                     // current version

diff --git a/src/lib/extra_bin.ts b/src/lib/extra_bin.ts
@@ -19,11 +19,6 @@ export default class ExtraBin {
         return path.resolve(ExtraBin.extraBinDir, "git");
     }
 
-    static get curlDir(): string {
-        OsUtils.onlyInWindows()
-        return path.resolve(ExtraBin.extraBinDir, "curl");
-    }
-
     static get osUtilsDir(): string {
         OsUtils.onlyInWindows()
         return path.resolve(ExtraBin.extraBinDir, "os-utils");