From d50bb7bf3a13e2bb88dc6b611085bc24a3a0a35f Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 12 May 2021 10:47:05 -0700 Subject: [PATCH 1/5] fixing the snap deploy --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4b21a1e5..748e0968 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -59,7 +59,7 @@ jobs: needs: setup env: PKG_VERSION: ${{ needs.setup.outputs.package_version }} - TAG_VERSION: ${{ needs.setup.ouputs.tag_version }} + TAG_VERSION: ${{ needs.setup.outputs.tag_version }} steps: - name: Checkout Repo uses: actions/checkout@v2 From e2e41b7366d69afaeaa3988b2ff8e9e1daf95c3c Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 12 May 2021 10:47:58 -0700 Subject: [PATCH 2/5] fixing the macos deploy --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 748e0968..b8f44df1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -135,6 +135,9 @@ jobs: macos: runs-on: macos-latest needs: setup + env: + PKG_VERSION: ${{ needs.setup.outputs.package_version }} + TAG_VERSION: ${{ needs.setup.outputs.tag_version }} steps: - name: Checkout repo uses: actions/checkout@v2 From 7d959ffffb70776fb568026135774ecf1247e060 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 12 May 2021 10:53:20 -0700 Subject: [PATCH 3/5] fixing the choco release asset grab --- .github/workflows/deploy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b8f44df1..d369462c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -101,12 +101,12 @@ jobs: uses: actions/checkout@v2 - name: Get choco release asset - uses: dsaltares/fetch-gh-release-asset@0.0.5 + uses: Xotl/cool-github-releases@v1 with: - version: tags/${{ env.TAG_VERSION }} - file: bitwarden.${{ env.PKG_VERSION }}.nupkg - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + mode: download + tag_name: ${{ env.TAG_VERSION }} + assets: bitwarden.${{ env.PKG_VERSION }}.nupkg + github_token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Chocolatey run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/ From 3eb691fbd8f695f24eac4d4bdda20a96b45b9872 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 12 May 2021 10:54:20 -0700 Subject: [PATCH 4/5] switching the env name --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d369462c..0a9f4d01 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -150,7 +150,7 @@ jobs: with: mode: download tag_name: ${{ env.TAG_VERSION }} - assets: Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg|./dist/mas-universal/Bitwarden-${{ env.PACKAGE_VERSION }}-universal.pkg + assets: Bitwarden-${{ env.PKG_VERSION }}-universal.pkg|./dist/mas-universal/Bitwarden-${{ env.PKG_VERSION }}-universal.pkg github_token: ${{ secrets.GITHUB_TOKEN }} - name: Deploy to App Store From 72c26ae9995a4301b28d057d62feb16f9615794d Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 12 May 2021 10:57:48 -0700 Subject: [PATCH 5/5] switching one more PKG_VERSION environment variable --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0a9f4d01..7bc1a8c8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -85,7 +85,7 @@ jobs: - name: Deploy to Snap Store run: | - snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable + snapcraft upload dist/bitwarden_${{ env.PKG_VERSION }}_amd64.snap --release stable snapcraft logout