From 6a2eb5f00194ec2a5b2041b78d2946de87e2e57e Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Wed, 20 Jan 2021 15:53:35 +0000 Subject: [PATCH] removing the testing code from the pipelines --- .github/workflows/build-and-sign.yml | 132 --------------------------- .github/workflows/build.yml | 130 ++++++-------------------- .github/workflows/release.yml | 47 +++++----- 3 files changed, 50 insertions(+), 259 deletions(-) delete mode 100644 .github/workflows/build-and-sign.yml diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml deleted file mode 100644 index 4c510c62..00000000 --- a/.github/workflows/build-and-sign.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: Build & Sign - -on: - push: - branches-ignore: - - 'l10n_master' - - 'gh-pages' - release: - types: - - published - - -jobs: - windows: - runs-on: windows-latest - environment: prod - 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: - node-version: '10.x' - - - name: Set Node options - run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - shell: pwsh - - - name: Print environment - run: | - node --version - npm --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 - - - name: Load package version - run: ./.github/scripts/load-version.ps1 - shell: pwsh - - - name: Install Node dependencies - run: npm install - - - name: Run linter - run: npm run lint - - - name: Build application - run: npm run build - - - name: Build & Sign - run: | - npm run build - npm run pack:win - env: - 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 }} - SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} - SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} - - - 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 appx ia32 artifact (not signed) - 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 appx x64 artifact (not signed) - 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: | - 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 43f24a53..1ce0a04f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,10 +5,6 @@ on: branches-ignore: - 'l10n_master' - 'gh-pages' - release: - types: - #- published - - created jobs: @@ -44,13 +40,9 @@ 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 + run: | + sudo snap install snapcraft --classic - name: Print environment run: | @@ -76,50 +68,43 @@ jobs: run: npm run dist:lin - name: Upload .deb artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-amd64.deb path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-amd64.deb - name: Upload .rpm artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.rpm path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.rpm - name: Upload .freebsd artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.freebsd path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.freebsd - name: Upload .snap artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: name: bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap path: ./dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap - name: Upload .AppImage artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: 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 windows: runs-on: windows-latest - environment: prod steps: - name: Set up dotnet uses: actions/setup-dotnet@v1 @@ -155,14 +140,10 @@ jobs: dotnet pack --output ./nupkg dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool - #- name: Set up environment - # if: false 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 + shell: pwsh + run: | + choco install checksum --no-progress - name: Print environment run: | @@ -184,7 +165,6 @@ jobs: run: npm run lint - name: Build & Sign (dev) - if: github.event_name != 'release' run: | npm run build npm run pack:win @@ -196,18 +176,6 @@ jobs: SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} - #- name: Build, Sign & Release - # if: github.event_name == 'release' - # run: npm run publish:win - # env: - # 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 }} - # SIGNING_CLIENT_SECRET: ${{ secrets.SIGNING_CLIENT_SECRET }} - # SIGNING_CERT_NAME: ${{ secrets.SIGNING_CERT_NAME }} - # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - - name: Rename appx files for store shell: pwsh run: | @@ -217,58 +185,33 @@ 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' 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' 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' 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' uses: actions/upload-artifact@v2 with: 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: 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/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: @@ -330,86 +273,67 @@ jobs: run: npm run lint - name: Create Safari directory - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' shell: pwsh run: New-Item ./dist-safari -ItemType Directory -ea 0 - name: Checkout browser extension - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/checkout@v2 with: repository: 'bitwarden/browser' path: 'dist-safari/browser' - name: Build Safari extension - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' shell: pwsh run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy - name: Load Safari extension for .dmg - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' shell: pwsh run: ./scripts/safari-build.ps1 -copyonly - name: Build application (dev) - if: github.ref != 'refs/heads/master' && github.event_name != 'release' + if: github.ref != 'refs/heads/master' run: npm run build - name: Build application (dist) - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' run: npm run dist:mac env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload .zip artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip - name: Upload .dmg artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: name: Bitwarden-${{ env.PACKAGE_VERSION }}.dmg path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}.dmg - name: Load Safari extension for App Store - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' shell: pwsh run: ./scripts/safari-build.ps1 -mas -copyonly - name: Build application for App Store - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' run: npm run dist:mac:mas env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - name: Upload .pkg artifact - if: github.ref == 'refs/heads/master' || github.event_name == 'release' + if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: 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: Upload release assets - # if: github.event_name == 'release' - # run: | - # hub release edit ` - # -a ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg ` - # -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4426c3a..e6318681 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,9 +44,9 @@ jobs: - name: Set up snap run: | sudo snap install snapcraft --classic - # echo "$SNAP_TOKEN" | snapcraft login --with - - #env: - # SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }} + echo "$SNAP_TOKEN" | snapcraft login --with - + env: + SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }} - name: Print environment run: | @@ -101,15 +101,14 @@ jobs: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x86_64.AppImage - #- 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 steps: - name: Set up dotnet uses: actions/setup-dotnet@v1 @@ -145,13 +144,13 @@ jobs: dotnet pack --output ./nupkg dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool - #- name: Set up environment - # 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 + 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: | @@ -215,15 +214,15 @@ jobs: name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx - #- name: Deploy to Chocolatey - # run: ./scripts/choco-update.ps1 -version $env:PACKAGE_VERSION - # shell: pwsh + - name: Deploy to Chocolatey + run: ./scripts/choco-update.ps1 -version $env:PACKAGE_VERSION + shell: pwsh - #- name: Upload Chocolatey nupkg artifact - # 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 + uses: actions/upload-artifact@v2 + with: + name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg + path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg - name: Upload release assets run: |