From 857c9515daa1b8a6e844153f233921db5e7232b1 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 21:55:14 +0000 Subject: [PATCH 1/5] version bump --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index a80d985ab8..18450719f8 100644 --- a/src/package.json +++ b/src/package.json @@ -2,7 +2,7 @@ "name": "bitwarden", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "1.23.1a", + "version": "1.23.2-alpha", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", From d68c62ab9123e86bfaa3ca58b3ffe66badd9122b Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 22:23:14 +0000 Subject: [PATCH 2/5] removing deploy jobs (should be moved into its own workflow) --- .github/workflows/build.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdc91cb20b..d89ef0a601 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,12 +109,12 @@ jobs: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage - - name: Deploy to Snap Store - if: github.event_name == 'release' - run: | - ./scripts/snap-update.ps1 -version $env:PACKAGE_VERSION - snapcraft logout - shell: pwsh + #- name: Deploy to Snap Store + # if: github.event_name == 'release' + # run: | + # ./scripts/snap-update.ps1 -version $env:PACKAGE_VERSION + # snapcraft logout + # shell: pwsh windows: runs-on: windows-latest @@ -197,10 +197,10 @@ jobs: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx - - name: Deploy to Chocolatey - if: github.event_name == 'release' - run: ./scripts/choco-update.ps1 -version $env:PACKAGE_VERSION - shell: pwsh + # - name: Deploy to Chocolatey + # if: github.event_name == 'release' + # run: ./scripts/choco-update.ps1 -version $env:PACKAGE_VERSION + # shell: pwsh - name: Upload Chocolatey nupkg artifact if: github.event_name == 'release' @@ -350,12 +350,12 @@ jobs: name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg - - name: Deploy to App Store - if: github.event_name == 'release' - run: npm run upload:mas - env: - APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} - APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + # - name: Deploy to App Store + # if: github.event_name == 'release' + # run: npm run upload:mas + # env: + # APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} + # APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload release assets if: github.event_name == 'release' From 2a6add76db7c5da3ad0f68bae6a9db0424f8f756 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 22:53:33 +0000 Subject: [PATCH 3/5] updating GH_TOKEN secret name because GITHUB_TOKEN wasn't valid --- .github/workflows/build.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d89ef0a601..46bd8cb57d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,13 +43,13 @@ jobs: sudo apt-get update sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm - - name: Set up snap - if: github.event_name == 'release' - run: | - sudo snap install snapcraft --classic - echo "$SNAP_TOKEN" | snapcraft login --with - - env: - SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }} + # - name: Set up snap + # if: github.event_name == 'release' + # run: | + # sudo snap install snapcraft --classic + # echo "$SNAP_TOKEN" | snapcraft login --with - + # env: + # SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }} - name: Print environment run: | @@ -129,14 +129,14 @@ jobs: run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append shell: pwsh - - name: Set up environment - if: github.event_name == 'release' - 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 }} + # - name: Set up environment + # if: github.event_name == 'release' + # 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 }} - name: Print environment run: | @@ -220,7 +220,7 @@ jobs: $env:RELEASE_TAG_NAME shell: pwsh env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} macos: @@ -366,5 +366,5 @@ jobs: $env:RELEASE_TAG_NAME shell: pwsh env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} From 41f263d378cfaceb2955ee91a87e4d57daa92a43 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 23:58:49 +0000 Subject: [PATCH 4/5] commenting out the chocolatey package --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46bd8cb57d..421f3158b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -202,18 +202,18 @@ jobs: # run: ./scripts/choco-update.ps1 -version $env:PACKAGE_VERSION # shell: pwsh - - name: Upload Chocolatey nupkg artifact - if: github.event_name == 'release' - uses: actions/upload-artifact@v2 - with: - name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg - path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg + # - name: Upload Chocolatey nupkg artifact + # if: github.event_name == 'release' + # uses: actions/upload-artifact@v2 + # with: + # name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg + # path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg - name: Upload release assets if: github.event_name == 'release' run: | hub release edit ` - -a ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg ` + #-a ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg ` -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx ` -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx ` -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" ` From 030eab729093c1a6d92df9544e4d531bb45a8ea8 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 15 Dec 2020 00:59:16 +0000 Subject: [PATCH 5/5] removing a line in a pwsh multiline script --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 421f3158b6..8d8d61aa24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -213,7 +213,6 @@ jobs: if: github.event_name == 'release' run: | hub release edit ` - #-a ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg ` -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx ` -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx ` -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `