[WFX-391] Swap out wget with aria2.

BrowserWorks · Jul 27, 2022 · 872e264 · 872e264
1 parent 8575f43
commit 872e264
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml
@@ -39,8 +39,8 @@ jobs:
       - name: 💿 Setup extra build dependencies
         run: |
           sudo apt update
-          sudo apt install -y build-essential libpython3-dev m4 nodejs unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb upx nsis jq yasm nasm
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          sudo apt install -y uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev xvfb upx nsis jq yasm nasm
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -107,7 +107,7 @@ jobs:
         run: |
           rustup target add ${{ env.ARCH }}
           sudo apt install nasm yasm
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -163,7 +163,7 @@ jobs:
       - name: 💿 Build dependencies installation
         run: |
           rustup target add ${{ env.ARCH }}
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -223,7 +223,7 @@ jobs:
           sudo update-alternatives --remove-all clang++
           sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100
           sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -41,7 +41,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y build-essential libpython3-dev m4 nodejs unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb upx nsis jq yasm nasm
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -52,7 +52,7 @@ jobs:
 
       - name: 💿 Setup jsign
         run: |
-          wget https://github.com/ebourg/jsign/releases/download/4.0/jsign_4.0_all.deb
+          aria2c https://github.com/ebourg/jsign/releases/download/4.0/jsign_4.0_all.deb
           sudo apt install -y ./jsign_4.0_all.deb
 
       - name: ⏬ Setup win-cross
@@ -187,7 +187,7 @@ jobs:
           cargo install cbindgen
           sudo apt update
           sudo apt install nasm yasm
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -245,7 +245,7 @@ jobs:
           rustup default 1.59.0-x86_64-unknown-linux-gnu
           rustup target add ${{ env.ARCH }}
           cargo install cbindgen
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -304,12 +304,12 @@ jobs:
       - name: 💿 Setup build packages
         run: |
           sudo apt update
-          sudo apt install -y build-essential libpython3-dev m4 nodejs unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev clang-12 yasm nasm
+          sudo apt install -y uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev xvfb upx nsis jq yasm nasm
           sudo update-alternatives --remove-all clang
           sudo update-alternatives --remove-all clang++
           sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100
           sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100
-          wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
+          aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
 
@@ -413,7 +413,8 @@ jobs:
 
       - name: ✍️ Sign .app
         run: |
-          wget https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/codesign.bash https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/production.entitlements.xml
+          aria2c https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/codesign.bash
+          aria2c https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/production.entitlements.xml
           chmod +x ./codesign.bash
           ./codesign.bash -a ./obj-${{ env.ARCH }}/dist/waterfox/Waterfox.app -i "${{ secrets.MACOS_ID }}" -e ./production.entitlements.xml
           sudo chmod -R 755 ./obj-${{ env.ARCH }}/dist/waterfox/Waterfox.app
@@ -452,7 +453,7 @@ jobs:
           '    </update>'
           '</updates>')
           for line in "${xml[@]}" ; do echo $line >> ./obj-${{ env.ARCH }}/dist/update/update.xml ; done
-          wget https://cdn.waterfox.net/tools/mar
+          aria2c https://cdn.waterfox.net/tools/mar
           chmod +x ./mar
           MAR=./mar MOZ_PRODUCT_VERSION=$VERSION_DISPLAY MAR_CHANNEL_ID="default" \
               ./tools/update-packaging/make_full_update.sh \
@@ -528,7 +529,8 @@ jobs:
 
       - name: ✍️ Sign .app
         run: |
-          wget https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/codesign.bash https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/production.entitlements.xml
+          aria2c https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/codesign.bash
+          aria2c https://hg.mozilla.org/releases/mozilla-esr60/raw-file/tip/security/mac/hardenedruntime/production.entitlements.xml
           chmod +x ./codesign.bash
           ./codesign.bash -a ./obj-${{ env.ARCH }}/dist/waterfox/Waterfox.app -i "${{ secrets.MACOS_ID }}" -e ./production.entitlements.xml
           sudo chmod -R 755 ./obj-${{ env.ARCH }}/dist/waterfox/Waterfox.app
@@ -567,7 +569,7 @@ jobs:
           '    </update>'
           '</updates>')
           for line in "${xml[@]}" ; do echo $line >> ./obj-${{ env.ARCH }}/dist/update/update.xml ; done
-          wget https://cdn.waterfox.net/tools/mar
+          aria2c https://cdn.waterfox.net/tools/mar
           chmod +x ./mar
           MAR=./mar MOZ_PRODUCT_VERSION=$VERSION_DISPLAY MAR_CHANNEL_ID="default" \
               ./tools/update-packaging/make_full_update.sh \
@@ -604,5 +606,5 @@ jobs:
       - name: ♻️ Stage files
         run: |
           VERSION_DISPLAY=`cat browser/config/version_display.txt`
-          AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} aws s3 cp --content-type="text/xml" --metadata-directive="REPLACE" ./obj-${{ env.ARCH }}/dist/update/update.xml s3://aus.waterfox.net/update/staging/Darwin_aarch64/update.xml
+          aws s3 cp --content-type="text/xml" --metadata-directive="REPLACE" ./obj-${{ env.ARCH }}/dist/update/update.xml s3://aus.waterfox.net/update/staging/Darwin_aarch64/update.xml
           rsync -rtvz --chmod=D2755,F644 --delete-before --progress {obj-${{ env.ARCH }}/dist/waterfox/Waterfox\ ${VERSION_DISPLAY}\ ARM\ Setup.dmg,./obj-${{ env.ARCH }}/dist/update/waterfox-$VERSION_DISPLAY.en-US.osx-arm64.complete.xz.mar} [email protected]:waterfox/staging/aarch64/Darwin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,12 +21,11 @@ jobs:
     steps:
       - name: Download assets
         run: |
-          sudo apt install wget2
-          wget2 https://cdn.waterfox.net/staging/x86_64/Windows_NT/Waterfox\ ${{ github.event.inputs.version }}\ Setup.exe
-          wget2 https://cdn.waterfox.net/staging/x86_64/Windows_NT/Install\ Waterfox.exe
-          wget2 https://cdn.waterfox.net/staging/x86_64/Linux/waterfox-${{ github.event.inputs.version }}.en-US.linux-x86_64.tar.bz2
-          wget2 https://cdn.waterfox.net/staging/x86_64/Darwin/Waterfox\ ${{ github.event.inputs.version }}\ Setup.dmg
-          wget2 https://cdn.waterfox.net/staging/aarch64/Darwin/Waterfox\ ${{ github.event.inputs.version }}\ ARM\ Setup.dmg
+          aria2c https://cdn.waterfox.net/staging/x86_64/Windows_NT/Waterfox\ ${{ github.event.inputs.version }}\ Setup.exe
+          aria2c https://cdn.waterfox.net/staging/x86_64/Windows_NT/Install\ Waterfox.exe
+          aria2c https://cdn.waterfox.net/staging/x86_64/Linux/waterfox-${{ github.event.inputs.version }}.en-US.linux-x86_64.tar.bz2
+          aria2c https://cdn.waterfox.net/staging/x86_64/Darwin/Waterfox\ ${{ github.event.inputs.version }}\ Setup.dmg
+          aria2c https://cdn.waterfox.net/staging/aarch64/Darwin/Waterfox\ ${{ github.event.inputs.version }}\ ARM\ Setup.dmg
 
       - name: Release Step
         uses: ncipollo/release-action@v1