From 52d9244f7f8b2e8f7721c3afadedb13377c61537 Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:22:22 -0800 Subject: [PATCH] Revert linux ARM (#1162) * Revert "Adding the newly added Linux Arm Desktop build assets to the release (#1159)" This reverts commit dde7afb3df727de3344b650b1dcd47586cc7a326. * Revert "package: Package ARM64 binaries for Linux (#1095)" This reverts commit dd602024d883845e4051fad522a6cf71e9ea951b. --- .github/workflows/build.yml | 28 ---------------------------- .github/workflows/release.yml | 4 ---- package.json | 14 +++++++------- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7fdc488730..656afde590 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,13 +143,6 @@ jobs: path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-amd64.deb if-no-files-found: error - - name: Upload ARM64 .deb artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 - with: - name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.deb - path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.deb - if-no-files-found: error - - name: Upload .rpm artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 with: @@ -157,13 +150,6 @@ jobs: path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.rpm if-no-files-found: error - - name: Upload ARM64 .rpm artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 - with: - name: Bitwarden-${{ env._PACKAGE_VERSION }}-aarch64.rpm - path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-aarch64.rpm - if-no-files-found: error - - name: Upload .freebsd artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 with: @@ -171,13 +157,6 @@ jobs: path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x64.freebsd if-no-files-found: error - - name: Upload ARM64 .freebsd artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 - with: - name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.freebsd - path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.freebsd - if-no-files-found: error - - name: Upload .snap artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 with: @@ -192,13 +171,6 @@ jobs: path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-x86_64.AppImage if-no-files-found: error - - name: Upload ARM64 .AppImage artifact - uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 - with: - name: Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.AppImage - path: ./dist/Bitwarden-${{ env._PACKAGE_VERSION }}-arm64.AppImage - if-no-files-found: error - - name: Upload latest auto-update artifact uses: actions/upload-artifact@ee69f02b3dfdecd58bb31b4d133da38ba6fe3700 # v2.2.3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a054872d8..97897d9d7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,14 +63,10 @@ jobs: PKG_VERSION: ${{ steps.retrieve-version.outputs.package_version }} with: artifacts: "Bitwarden-${{ env.PKG_VERSION }}-amd64.deb, - Bitwarden-${{ env.PKG_VERSION }}-arm64.deb, Bitwarden-${{ env.PKG_VERSION }}-x86_64.rpm, - Bitwarden-${{ env.PKG_VERSION }}-aarch64.rpm, Bitwarden-${{ env.PKG_VERSION }}-x64.freebsd, - Bitwarden-${{ env.PKG_VERSION }}-arm64.freebsd, bitwarden_${{ env.PKG_VERSION }}_amd64.snap, Bitwarden-${{ env.PKG_VERSION }}-x86_64.AppImage, - Bitwarden-${{ env.PKG_VERSION }}-arm64.AppImage, latest-linux.yml, Bitwarden-Portable-${{ env.PKG_VERSION }}.exe, Bitwarden-Installer-${{ env.PKG_VERSION }}.exe, diff --git a/package.json b/package.json index 03a7a387b0..574fefd5f4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "clean:dist": "rimraf ./dist/*", "clean:l10n": "git push origin --delete l10n_master", "pack:dir": "npm run clean:dist && electron-builder --dir -p never", - "pack:lin": "npm run clean:dist && electron-builder --linux -p never", + "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never", "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never", "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never", "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never", @@ -54,7 +54,7 @@ "dist:mac:masdev": "npm run build && npm run pack:mac:masdev", "dist:win": "npm run build && npm run pack:win", "dist:win:ci": "npm run build && npm run pack:win:ci", - "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux -p always", + "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux --x64 -p always", "publish:mac": "npm run build && npm run clean:dist && electron-builder --mac -p always", "publish:mac:mas": "npm run dist:mac:mas && npm run upload:mas", "publish:win": "npm run build && npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p always -c.win.certificateSubjectName=\"8bit Solutions LLC\"", @@ -142,11 +142,11 @@ "category": "Utility", "synopsis": "A secure and free password manager for all of your devices.", "target": [ - { "target": "deb", "arch": [ "x64", "arm64" ]}, - { "target": "freebsd", "arch": [ "x64", "arm64" ]}, - { "target": "rpm", "arch": [ "x64", "arm64" ]}, - { "target": "AppImage", "arch": [ "x64", "arm64" ]}, - { "target": "snap", "arch": [ "x64" ]} + "deb", + "freebsd", + "rpm", + "AppImage", + "snap" ], "desktop": { "Name": "Bitwarden",