mirror of
https://github.com/bitwarden/browser
synced 2026-01-07 02:53:28 +00:00
Update workflows with linter suggestions (#366)
This commit is contained in:
Vince Grassia
GitHub
44
.github/workflows/release.yml
vendored
44
.github/workflows/release.yml
vendored
@@ -1,3 +1,4 @@
|
||||
---
|
||||
name: Release
|
||||
|
||||
on:
|
||||
@@ -10,6 +11,7 @@ on:
|
||||
|
||||
jobs:
|
||||
setup:
|
||||
name: Setup
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
release_upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
@@ -68,8 +70,8 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
needs: setup
|
||||
env:
|
||||
WIN_PKG_FETCH_VERSION: 14.17.0
|
||||
WIN_PKG_VERSION: 3.1
|
||||
_WIN_PKG_FETCH_VERSION: 14.17.0
|
||||
_WIN_PKG_VERSION: 3.1
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # 2.3.4
|
||||
@@ -98,11 +100,11 @@ jobs:
|
||||
shell: pwsh
|
||||
run: |
|
||||
cd $HOME
|
||||
$fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v$env:WIN_PKG_VERSION/node-v$env:WIN_PKG_FETCH_VERSION-win-x64"
|
||||
$fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v$env:_WIN_PKG_VERSION/node-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
|
||||
|
||||
New-Item -ItemType directory -Path .\.pkg-cache
|
||||
New-Item -ItemType directory -Path .\.pkg-cache\v$env:WIN_PKG_VERSION
|
||||
Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v$env:WIN_PKG_VERSION\fetched-v$env:WIN_PKG_FETCH_VERSION-win-x64"
|
||||
New-Item -ItemType directory -Path .\.pkg-cache\v$env:_WIN_PKG_VERSION
|
||||
Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v$env:_WIN_PKG_VERSION\fetched-v$env:_WIN_PKG_FETCH_VERSION-win-x64"
|
||||
|
||||
- name: Setup Version Info
|
||||
shell: pwsh
|
||||
@@ -113,8 +115,8 @@ jobs:
|
||||
shell: cmd
|
||||
run: |
|
||||
set PATH=%PATH%;C:\Program Files (x86)\Resource Hacker
|
||||
set WIN_PKG=C:\Users\runneradmin\.pkg-cache\v%WIN_PKG_VERSION%\fetched-v%WIN_PKG_FETCH_VERSION%-win-x64
|
||||
set WIN_PKG_BUILT=C:\Users\runneradmin\.pkg-cache\v%WIN_PKG_VERSION%\built-v%WIN_PKG_FETCH_VERSION%-win-x64
|
||||
set WIN_PKG=C:\Users\runneradmin\.pkg-cache\v%_WIN_PKG_VERSION%\fetched-v%_WIN_PKG_FETCH_VERSION%-win-x64
|
||||
set WIN_PKG_BUILT=C:\Users\runneradmin\.pkg-cache\v%_WIN_PKG_VERSION%\built-v%_WIN_PKG_FETCH_VERSION%-win-x64
|
||||
|
||||
copy %WIN_PKG% %WIN_PKG_BUILT%
|
||||
ResourceHacker -open %WIN_PKG_BUILT% -save %WIN_PKG_BUILT% -action delete -mask ICONGROUP,1,
|
||||
@@ -123,7 +125,7 @@ jobs:
|
||||
|
||||
- name: Setup sub-module
|
||||
run: npm run sub:init
|
||||
|
||||
|
||||
- name: Install
|
||||
run: npm install
|
||||
|
||||
@@ -254,11 +256,11 @@ jobs:
|
||||
snap:
|
||||
name: Release Snap
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
needs:
|
||||
- setup
|
||||
- cli
|
||||
env:
|
||||
PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
|
||||
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # 2.3.4
|
||||
@@ -268,7 +270,7 @@ jobs:
|
||||
whoami
|
||||
echo "GitHub ref: $GITHUB_REF"
|
||||
echo "GitHub event: $GITHUB_EVENT"
|
||||
echo "BW Package Version: $PACKAGE_VERSION"
|
||||
echo "BW Package Version: $_PACKAGE_VERSION"
|
||||
env:
|
||||
GITHUB_REF: ${{ github.ref }}
|
||||
GITHUB_EVENT: ${{ github.event_name }}
|
||||
@@ -276,14 +278,14 @@ jobs:
|
||||
- name: Get linux zip artifact
|
||||
uses: actions/download-artifact@158ca71f7c614ae705e79f25522ef4658df18253 # 2.0.9
|
||||
with:
|
||||
name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
|
||||
name: bw-linux-${{ env._PACKAGE_VERSION }}.zip
|
||||
path: ./dist/snap
|
||||
|
||||
- name: Setup Snap Package
|
||||
run: |
|
||||
cp -r stores/snap/* -t dist/snap
|
||||
sed -i s/__version__/${{ env.PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
|
||||
|
||||
sed -i s/__version__/${{ env._PACKAGE_VERSION }}/g dist/snap/snapcraft.yaml
|
||||
|
||||
cd dist/snap
|
||||
ls -alth
|
||||
|
||||
@@ -296,16 +298,16 @@ jobs:
|
||||
run: |
|
||||
cd dist/snap
|
||||
ls -alth
|
||||
sha256sum bw_${{ env.PACKAGE_VERSION }}_amd64.snap | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
|
||||
sha256sum bw_${{ env._PACKAGE_VERSION }}_amd64.snap | awk '{split($0, a); print a[1]}' > bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
|
||||
|
||||
- name: Install Snap
|
||||
- name: Install Snap
|
||||
run: sudo snap install ./dist/snap/bw*.snap --dangerous
|
||||
|
||||
- name: Test Snap
|
||||
shell: pwsh
|
||||
run: |
|
||||
$testVersion = Invoke-Expression '& bw -v'
|
||||
if($testVersion -ne $env:PACKAGE_VERSION) {
|
||||
if($testVersion -ne $env:_PACKAGE_VERSION) {
|
||||
Throw "Version test failed."
|
||||
}
|
||||
env:
|
||||
@@ -322,8 +324,8 @@ jobs:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ needs.setup.outputs.release_upload_url }}
|
||||
asset_name: bw_${{ env.PACKAGE_VERSION }}_amd64.snap
|
||||
asset_path: ./dist/snap/bw_${{ env.PACKAGE_VERSION }}_amd64.snap
|
||||
asset_name: bw_${{ env._PACKAGE_VERSION }}_amd64.snap
|
||||
asset_path: ./dist/snap/bw_${{ env._PACKAGE_VERSION }}_amd64.snap
|
||||
asset_content_type: application
|
||||
|
||||
- name: Upload snap checksum release asset
|
||||
@@ -332,6 +334,6 @@ jobs:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ needs.setup.outputs.release_upload_url }}
|
||||
asset_name: bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
|
||||
asset_path: ./dist/snap/bw-snap-sha256-${{ env.PACKAGE_VERSION }}.txt
|
||||
asset_name: bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
|
||||
asset_path: ./dist/snap/bw-snap-sha256-${{ env._PACKAGE_VERSION }}.txt
|
||||
asset_content_type: plain/text
|
||||
|
||||
Reference in New Issue
Block a user