From 65a13d997ab8e99d0db63679190b78c0711441e5 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 18:04:18 +0000 Subject: [PATCH 01/12] experimenting with no CSC_* env vars --- .github/workflows/build.yml | 49 ++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78e85b11bc8..f832cff64f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,6 +123,11 @@ jobs: runs-on: windows-latest steps: + - name: Set up dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "3.1.x" + - name: Set up Node uses: actions/setup-node@v1 with: @@ -145,7 +150,31 @@ jobs: run: | node --version npm --version - choco --version + #choco --version + dotnet --version + + + - name: Install AST + shell: pwsh + run: | + cd $HOME + + git clone https://github.com/vcsjones/AzureSignTool.git + cd AzureSignTool + $latest_head = $(git rev-parse HEAD)[0..9] -join "" + $latest_version = "0.0.0-g$latest_head" + + Write-Host "--------" + Write-Host "git commit - $(git rev-parse HEAD)" + Write-Host "latest_head - $latest_head" + Write-Host "PACKAGE VERSION TO BUILD - $latest_version" + Write-Host "--------" + + dotnet restore + dotnet pack --output ./nupkg + dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool + + cd $HOME - name: Checkout repo uses: actions/checkout@v2 @@ -163,6 +192,13 @@ jobs: - name: Build application shell: pwsh run: npm run dist:win:ci + env: + SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} + SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} + SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} + SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} + SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} + SECRET_TEST: ${{ secrets.SECRET_TEST }} - name: Rename appx files for store shell: pwsh @@ -211,6 +247,17 @@ jobs: # with: # name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg # path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg + + - name: Repack & Sign + run: | + npm run pack:win + env: + SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} + SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} + SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} + SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} + SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} + SECRET_TEST: ${{ secrets.SECRET_TEST }} #- name: Upload release assets # if: github.event_name == 'release' From 7a2aa34619a8073c4ddbe383cebaac981e539672 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 18:07:22 +0000 Subject: [PATCH 02/12] adding the other artifacts to the windows portion of the build --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f832cff64f7..703d65c468f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -259,6 +259,37 @@ jobs: SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} SECRET_TEST: ${{ secrets.SECRET_TEST }} + - name: List Dist + run: dir ./dist + + - name: Upload signed portable exe artifact + #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + uses: actions/upload-artifact@v2 + with: + name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}-signed.exe + path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe + + - name: Upload signed installer exe artifact + #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + uses: actions/upload-artifact@v2 + with: + name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}-signed.exe + path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe + + - name: Upload signed appx ia32 artifact + #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + uses: actions/upload-artifact@v2 + with: + name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx + path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx + + - name: Upload signed appx x64 artifact + #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + uses: actions/upload-artifact@v2 + with: + name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx + path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx + #- name: Upload release assets # if: github.event_name == 'release' # run: | From 048f3fed6f85b97e76ff5eeb150a5934bf3fcbb4 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 18:17:50 +0000 Subject: [PATCH 03/12] adding in the forgotten environment --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 703d65c468f..15ee6683ad0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: windows: runs-on: windows-latest - + environment: test_ast steps: - name: Set up dotnet uses: actions/setup-dotnet@v1 From c508c7cd0507eba3806f8777430b711ad639bba5 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 18:58:44 +0000 Subject: [PATCH 04/12] adding a signing flag for electron builder --- .github/workflows/build.yml | 8 ++------ sign.js | 32 +++++++++++++++++--------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15ee6683ad0..ffbbabee08e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -193,12 +193,7 @@ jobs: shell: pwsh run: npm run dist:win:ci env: - SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} - SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} - SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} - SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} - SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} - SECRET_TEST: ${{ secrets.SECRET_TEST }} + ELECTRON_BUILDER_SIGN: false - name: Rename appx files for store shell: pwsh @@ -252,6 +247,7 @@ jobs: run: | npm run pack:win env: + ELECTRON_BUILDER_SIGN: true SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} diff --git a/sign.js b/sign.js index e7a6df8909f..f3969c37761 100644 --- a/sign.js +++ b/sign.js @@ -1,17 +1,19 @@ exports.default = async function(configuration) { - require("child_process").execSync( - `azuresigntool sign ` + - `-kvu ${process.env.SIGNING_VAULT_URL} ` + - `-kvi ${process.env.SIGNING_CLIENT_ID} ` + - `-kvt ${process.env.SIGNING_TENANT_ID} ` + - `-kvs ${process.env.SIGNING_CLIENT_SECRET} ` + - `-kvc ${process.env.SIGNING_CERT_NAME} ` + - `-fd ${configuration.hash} ` + - `-du ${configuration.site} ` + - `-tr http://timestamp.digicert.com ` + - `${configuration.path}`, - { - stdio: "inherit" - } - ); + if (process.env.ELECTRON_BUILDER_SIGN) { + require("child_process").execSync( + `azuresigntool sign ` + + `-kvu ${process.env.SIGNING_VAULT_URL} ` + + `-kvi ${process.env.SIGNING_CLIENT_ID} ` + + `-kvt ${process.env.SIGNING_TENANT_ID} ` + + `-kvs ${process.env.SIGNING_CLIENT_SECRET} ` + + `-kvc ${process.env.SIGNING_CERT_NAME} ` + + `-fd ${configuration.hash} ` + + `-du ${configuration.site} ` + + `-tr http://timestamp.digicert.com ` + + `${configuration.path}`, + { + stdio: "inherit" + } + ); + } }; From 88bf9be15ff5c42329ba2e1029ee0250a1db700e Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 18:59:38 +0000 Subject: [PATCH 05/12] adding in the flag to the build_and_sign workflow --- .github/workflows/build-and-sign.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index fc29cf26705..7956f68307b 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -71,8 +71,7 @@ jobs: npm run build npm run pack:win env: - CSC_LINK: ${{ secrets.EB_SIGNING_CERT_IDENTIFIER_URL }} - CSC_KEY_PASSWORD: ${{ secrets.EB_SIGNING_CERT_KEY }} + ELECTRON_BUILDER_SIGN: true SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} From 33029c1684cc173969194f8e232faf36cc036975 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 19:19:18 +0000 Subject: [PATCH 06/12] removing the signing portion of the original workflow --- .github/workflows/build.yml | 72 ------------------------------------- 1 file changed, 72 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffbbabee08e..b90b69fce39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,11 +123,6 @@ jobs: runs-on: windows-latest environment: test_ast steps: - - name: Set up dotnet - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "3.1.x" - - name: Set up Node uses: actions/setup-node@v1 with: @@ -151,30 +146,6 @@ jobs: node --version npm --version #choco --version - dotnet --version - - - - name: Install AST - shell: pwsh - run: | - cd $HOME - - git clone https://github.com/vcsjones/AzureSignTool.git - cd AzureSignTool - $latest_head = $(git rev-parse HEAD)[0..9] -join "" - $latest_version = "0.0.0-g$latest_head" - - Write-Host "--------" - Write-Host "git commit - $(git rev-parse HEAD)" - Write-Host "latest_head - $latest_head" - Write-Host "PACKAGE VERSION TO BUILD - $latest_version" - Write-Host "--------" - - dotnet restore - dotnet pack --output ./nupkg - dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool - - cd $HOME - name: Checkout repo uses: actions/checkout@v2 @@ -242,49 +213,6 @@ jobs: # with: # name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg # path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg - - - name: Repack & Sign - run: | - npm run pack:win - env: - ELECTRON_BUILDER_SIGN: true - SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} - SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} - SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} - SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} - SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} - SECRET_TEST: ${{ secrets.SECRET_TEST }} - - - name: List Dist - run: dir ./dist - - - name: Upload signed portable exe artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' - uses: actions/upload-artifact@v2 - with: - name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}-signed.exe - path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe - - - name: Upload signed installer exe artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' - uses: actions/upload-artifact@v2 - with: - name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}-signed.exe - path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe - - - name: Upload signed appx ia32 artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' - uses: actions/upload-artifact@v2 - with: - name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx - path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx - - - name: Upload signed appx x64 artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' - uses: actions/upload-artifact@v2 - with: - name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx - path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx #- name: Upload release assets # if: github.event_name == 'release' From 5eb10afe856cded141575f17604767d610ba974e Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 19:33:43 +0000 Subject: [PATCH 07/12] changing over to a value based boolean flag --- .github/workflows/build-and-sign.yml | 2 +- .github/workflows/build.yml | 2 +- sign.js | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index 7956f68307b..dae775b2389 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -71,7 +71,7 @@ jobs: npm run build npm run pack:win env: - ELECTRON_BUILDER_SIGN: true + ELECTRON_BUILDER_SIGN: 1 SIGNING_VAULT_URL: ${{ secrets.SIGNING_VAULT_URL }} SIGNING_CLIENT_ID: ${{ secrets.SIGNING_CLIENT_ID }} SIGNING_TENANT_ID: ${{ secrets.SIGNING_TENANT_ID }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b90b69fce39..d0fe4686a42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: shell: pwsh run: npm run dist:win:ci env: - ELECTRON_BUILDER_SIGN: false + ELECTRON_BUILDER_SIGN: 0 - name: Rename appx files for store shell: pwsh diff --git a/sign.js b/sign.js index f3969c37761..b5ba6816ab0 100644 --- a/sign.js +++ b/sign.js @@ -1,5 +1,11 @@ exports.default = async function(configuration) { - if (process.env.ELECTRON_BUILDER_SIGN) { + + console.log('+++++++++++++++++++++++++++++++++++++++++++++++++++') + console.log(`ELECTRON_BUILDER_SIGN: ${process.env.ELECTRON_BUILDER_SIGN}`) + console.log(`Type: ${typeof process.env.ELECTRON_BUILDER_SIGN}`) + console.log('+++++++++++++++++++++++++++++++++++++++++++++++++++') + + if (process.env.ELECTRON_BUILDER_SIGN === 1) { require("child_process").execSync( `azuresigntool sign ` + `-kvu ${process.env.SIGNING_VAULT_URL} ` + From b1e4bd4bdbbe536b4be89581830819903a9bb5f4 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 19:43:42 +0000 Subject: [PATCH 08/12] assigning correct type --- sign.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sign.js b/sign.js index b5ba6816ab0..e2b5be6ccfb 100644 --- a/sign.js +++ b/sign.js @@ -5,7 +5,7 @@ exports.default = async function(configuration) { console.log(`Type: ${typeof process.env.ELECTRON_BUILDER_SIGN}`) console.log('+++++++++++++++++++++++++++++++++++++++++++++++++++') - if (process.env.ELECTRON_BUILDER_SIGN === 1) { + if (parseInt(process.env.ELECTRON_BUILDER_SIGN) === 1) { require("child_process").execSync( `azuresigntool sign ` + `-kvu ${process.env.SIGNING_VAULT_URL} ` + From 190fb423da418fd1270483f8c37e5d32d082ed6d Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 19:46:37 +0000 Subject: [PATCH 09/12] fixing unknown syntax error --- sign.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sign.js b/sign.js index e2b5be6ccfb..14bee1835f5 100644 --- a/sign.js +++ b/sign.js @@ -1,11 +1,5 @@ exports.default = async function(configuration) { - - console.log('+++++++++++++++++++++++++++++++++++++++++++++++++++') - console.log(`ELECTRON_BUILDER_SIGN: ${process.env.ELECTRON_BUILDER_SIGN}`) - console.log(`Type: ${typeof process.env.ELECTRON_BUILDER_SIGN}`) - console.log('+++++++++++++++++++++++++++++++++++++++++++++++++++') - - if (parseInt(process.env.ELECTRON_BUILDER_SIGN) === 1) { + if (process.env.ELECTRON_BUILDER_SIGN === 1) { require("child_process").execSync( `azuresigntool sign ` + `-kvu ${process.env.SIGNING_VAULT_URL} ` + From 92d4afb28dc2637ed528312f81e34652722e6371 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 20:38:30 +0000 Subject: [PATCH 10/12] removing appveyor to stop the fork from sending the repo to be built. Testing a release --- .github/workflows/build-and-sign.yml | 27 ++++++------ .github/workflows/build.yml | 44 +++++++++---------- ...eyor.yml => appveyor.yml.flagged-to-remove | 0 3 files changed, 34 insertions(+), 37 deletions(-) rename appveyor.yml => appveyor.yml.flagged-to-remove (100%) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index dae775b2389..53c2f3bc0a9 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -110,16 +110,17 @@ jobs: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx -#- name: Upload release assets -# 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'))" ` -# $env:RELEASE_TAG_NAME -# shell: pwsh -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} + - name: Upload release assets + if: github.event_name == 'release' + run: | + hub release edit ` + -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx ` + -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx ` + -a ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe ` + -a ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe ` + -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" ` + $env:RELEASE_TAG_NAME + shell: pwsh + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0fe4686a42..978200f1744 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,16 +1,13 @@ name: Build -on: - workflow_dispatch: - -# on: -# push: -# branches-ignore: -# - 'l10n_master' -# - 'gh-pages' -# release: -# types: -# - published +on: + push: + branches-ignore: + - 'l10n_master' + - 'gh-pages' + release: + types: + - published jobs: @@ -214,22 +211,21 @@ jobs: # 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/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx ` - # -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx ` - # -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" ` - # $env:RELEASE_TAG_NAME - # shell: pwsh - # env: - # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - # RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} + - name: Upload release assets + if: github.event_name == 'release' + run: | + hub release edit ` + -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'))" ` + $env:RELEASE_TAG_NAME + shell: pwsh + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + RELEASE_TAG_NAME: ${{ github.event.release.tag_name }} macos: runs-on: macos-latest - steps: - name: Set up Node uses: actions/setup-node@v1 diff --git a/appveyor.yml b/appveyor.yml.flagged-to-remove similarity index 100% rename from appveyor.yml rename to appveyor.yml.flagged-to-remove From 54ed6cd2b09d23e3c999f5c9dc6c460161ba4163 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 20:39:43 +0000 Subject: [PATCH 11/12] replacing manual dispatch trigger with push/release triggers --- .github/workflows/build-and-sign.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index 53c2f3bc0a9..4fbdab5ce22 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -1,7 +1,14 @@ name: Build & Sign -on: - workflow_dispatch: +on: + push: + branches-ignore: + - 'l10n_master' + - 'gh-pages' + release: + types: + - published + jobs: windows: From 899acaa92a1f8958ec6eb0a2988f151d6911347f Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 6 Jan 2021 20:45:43 +0000 Subject: [PATCH 12/12] uncommenting some if conditions --- .github/workflows/build-and-sign.yml | 8 ++++---- .github/workflows/build.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index 4fbdab5ce22..67efb4c2f75 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -90,28 +90,28 @@ jobs: run: dir ./dist - name: Upload signed portable exe artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}-signed.exe path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe - name: Upload signed installer exe artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}-signed.exe path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe - name: Upload signed appx ia32 artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx - name: Upload signed appx x64 artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 978200f1744..e70a68832fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -172,28 +172,28 @@ jobs: -Destination "./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx" - name: Upload portable exe artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe - name: Upload installer exe artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe - name: Upload store appx ia32 artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx - name: Upload store appx x64 artifact - #if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' || github.event_name == 'release' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx