From 2a408b4b2265ba4ff2c2416e295f0c6414b11c43 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 25 Jan 2021 00:08:44 +0000 Subject: [PATCH] removing testing code --- .github/workflows/release.yml | 17 +++++++---------- package.json | 2 +- src/package.json | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4db5b15e..f8f01282 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,6 @@ jobs: linux: runs-on: ubuntu-latest - if: false needs: setup steps: - name: Set up Node @@ -58,8 +57,8 @@ jobs: - name: Install Snap uses: samuelmeuli/action-snapcraft@v1 - #with: - # snapcraft_token: ${{ secrets.SNAP_TOKEN }} + with: + snapcraft_token: ${{ secrets.SNAP_TOKEN }} - name: Print environment run: | @@ -93,12 +92,11 @@ jobs: shell: pwsh run: | snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable - #snapcraft logout + snapcraft logout windows-signed: runs-on: windows-latest - environment: prod needs: setup steps: - name: Set up dotnet @@ -139,9 +137,9 @@ jobs: shell: pwsh run: | choco install checksum --no-progress - # choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/ - #env: - # CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }} + choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/ + env: + CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }} - name: Print environment run: | @@ -184,7 +182,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 uses: actions/upload-release-asset@v1 @@ -259,7 +257,6 @@ jobs: macos: runs-on: macos-latest - if: false needs: setup steps: - name: Set up Node diff --git a/package.json b/package.json index eb6ec3af..4f4bac1b 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/src/package.json b/src/package.json index 4d7b5c90..ec9c4904 100644 --- a/src/package.json +++ b/src/package.json @@ -2,14 +2,14 @@ "name": "bitwarden", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "1.24.2-alpha", + "version": "1.24.1", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", "main": "main.js", "repository": { "type": "git", - "url": "https://github.com/joseph-flinn/desktop" + "url": "https://github.com/bitwarden/desktop" }, "dependencies": { "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",