From a1559faefb0242ca4db796b91c8ce679dd736cde Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Fri, 22 Jan 2021 04:53:28 +0000 Subject: [PATCH] reverting all of the testing code --- .github/workflows/build.yml | 12 +++--- .github/workflows/release.yml | 79 +++-------------------------------- package.json | 2 +- scripts/choco-update.ps1 | 2 +- 4 files changed, 14 insertions(+), 81 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e7e89c5b3..95817329a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,13 +187,13 @@ jobs: - name: Deploy to Chocolatey shell: pwsh run: | - Copy-Item -Path ./stores/chocolatey -Destination ./chocolatey -Recurse - Copy-Item -Path ./dist/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe -Destination ./chocolatey + Copy-Item -Path ./stores/chocolatey -Destination ./dist/chocolatey -Recurse + Copy-Item -Path ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe -Destination ./dist/chocolatey - $checksum = checksum -t sha256 ./chocoloatey/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe - $chocoInstall = "./chocolatey/tools/chocolateyinstall.ps1" - (Get-Content $chocoInstall).replace('__version__', ${{ env.PACKAGE_VERSION }}).replace('__checksum__', $checksum) | Set-Content $chocoInstall - choco pack ./chocolatey/bitwarden.nuspec --version ${{ env.PACKAGE_VERSION }} --out ./chocolately + $checksum = checksum -t sha256 ./dist/chocoloatey/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe + $chocoInstall = "./dist/chocolatey/tools/chocolateyinstall.ps1" + (Get-Content $chocoInstall).replace('__version__', "$env:PACKAGE_VERSION").replace('__checksum__', $checksum) | Set-Content $chocoInstall + choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey - name: Upload portable exe artifact if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 334097cf19..2800cc537c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,75 +100,15 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - - name: Build application - if: false - run: npm run dist:lin - - - name: Upload .deb release asset - if: false - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.setup.outputs.release_upload_url }} - asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-amd64.deb - asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-amd64.deb - asset_content_type: application/x-debian-package - - - name: Upload .rpm release asset - if: false - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.setup.outputs.release_upload_url }} - asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.rpm - asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.rpm - asset_content_type: application - - - name: Upload .freebsd release asset - if: false - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.setup.outputs.release_upload_url }} - asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.freebsd - asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.freebsd - asset_content_type: application - - - name: Upload .snap checksum release asset - if: false - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.setup.outputs.release_upload_url }} - asset_name: bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap - asset_path: ./dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap - asset_content_type: application - - - name: Upload .AppImage checksum release asset - if: false - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.setup.outputs.release_upload_url }} - asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage - asset_path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage - asset_content_type: application - - #- name: Deploy to Snap Store - # run: | - # ./scripts/snap-update.ps1 -version $env:PACKAGE_VERSION - # snapcraft logout - # shell: pwsh + - name: Deploy to Snap Store + run: | + ./scripts/snap-update.ps1 -version $env:PACKAGE_VERSION + snapcraft logout + shell: pwsh windows: runs-on: windows-latest - environment: prod needs: setup steps: - name: Set up dotnet @@ -206,7 +146,6 @@ jobs: dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool - name: Set up environment - if: false shell: pwsh run: | choco install checksum --no-progress @@ -214,11 +153,6 @@ jobs: env: CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }} - - name: Set up environment - shell: pwsh - run: | - choco install checksum --no-progress - - name: Print environment run: | node --version @@ -268,7 +202,7 @@ jobs: (Get-Content $chocoInstall).replace('__version__', "$env:PACKAGE_VERSION").replace('__checksum__', $checksum) | Set-Content $chocoInstall choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey cd ./dist/chocolatey - #choco push + choco push - name: Upload Chocolatey nupkg release asset id: upload-macos-checksum @@ -283,7 +217,6 @@ jobs: macos: - if: false runs-on: macos-latest needs: setup steps: diff --git a/package.json b/package.json index 45cc2b611f..e1870315cb 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "homepage": "https://bitwarden.com", "repository": { "type": "git", - "url": "https://github.com/joseph-flinn/desktop" + "url": "https://github.com/bitwarden/desktop" }, "license": "GPL-3.0", "scripts": { diff --git a/scripts/choco-update.ps1 b/scripts/choco-update.ps1 index 4e2496581e..72677357aa 100644 --- a/scripts/choco-update.ps1 +++ b/scripts/choco-update.ps1 @@ -30,5 +30,5 @@ $chocoInstall = $distChocoDir + "\tools\chocolateyinstall.ps1"; (Get-Content $chocoInstall).replace('__version__', $version).replace('__checksum__', $checksum) | Set-Content $chocoInstall choco pack $nuspec --version $version --out $distChocoDir cd $distChocoDir -#choco push +choco push cd $rootDir