Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-30 12:54:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #749 from bitwarden/add-rc-auto

Browse Source 
fixing typo
This commit is contained in:
Joseph Flinn 2021-03-04 14:43:36 -08:00 committed by GitHub
commit 1c39c294e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build.yml vendored
View File

@ -198,42 +198,42 @@ jobs:
choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey
- name: Upload portable exe artifact - name: Upload portable exe artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
- name: Upload installer exe artifact - name: Upload installer exe artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
- name: Upload store appx ia32 artifact - name: Upload store appx ia32 artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx
- name: Upload store appx x64 artifact - name: Upload store appx x64 artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx
- name: Upload store appx ARM64 artifact - name: Upload store appx ARM64 artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx name: Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-arm64-store.appx
- name: Upload nupkg artifact - name: Upload nupkg artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
@ -300,66 +300,66 @@ jobs:
run: npm run lint run: npm run lint
- name: Create Safari directory - name: Create Safari directory
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
shell: pwsh shell: pwsh
run: New-Item ./dist-safari -ItemType Directory -ea 0 run: New-Item ./dist-safari -ItemType Directory -ea 0
- name: Checkout browser extension - name: Checkout browser extension
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: 'bitwarden/browser' repository: 'bitwarden/browser'
path: 'dist-safari/browser' path: 'dist-safari/browser'
- name: Build Safari extension - name: Build Safari extension
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
shell: pwsh shell: pwsh
run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy run: ./scripts/safari-build.ps1 -skipcheckout -skipoutcopy
- name: Load Safari extension for .dmg - name: Load Safari extension for .dmg
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
shell: pwsh shell: pwsh
run: ./scripts/safari-build.ps1 -copyonly run: ./scripts/safari-build.ps1 -copyonly
- name: Build application (dev) - name: Build application (dev)
if: github.ref != 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref != 'refs/heads/master' || github.ref == 'refs/heads/rc'
run: npm run build run: npm run build
- name: Build application (dist) - name: Build application (dist)
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
run: npm run dist:mac run: npm run dist:mac
env: env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
- name: Upload .zip artifact - name: Upload .zip artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip name: Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip
path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-mac.zip
- name: Upload .dmg artifact - name: Upload .dmg artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}.dmg name: Bitwarden-${{ env.PACKAGE_VERSION }}.dmg
path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}.dmg path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}.dmg
- name: Load Safari extension for App Store - name: Load Safari extension for App Store
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
shell: pwsh shell: pwsh
run: ./scripts/safari-build.ps1 -mas -copyonly run: ./scripts/safari-build.ps1 -mas -copyonly
- name: Build application for App Store - name: Build application for App Store
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
run: npm run dist:mac:mas run: npm run dist:mac:mas
env: env:
APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
- name: Upload .pkg artifact - name: Upload .pkg artifact
if: github.ref == 'refs/heads/master' || github.ref = 'refs/heads/rc' if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/rc'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg