1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-12 14:34:02 +00:00

ci: works on first try..?

This commit is contained in:
tangowithfoxtrot
2024-12-04 17:40:38 +00:00
committed by GitHub
parent f374ba84a7
commit 5a5121c60e
2 changed files with 19 additions and 8 deletions

View File

@@ -55,7 +55,7 @@ jobs:
- name: Check out repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.event.pull_request.head.sha }}
ref: ${{ github.event.pull_request.head.sha }}
- name: Get Package Version
id: retrieve-package-version
@@ -78,6 +78,7 @@ jobs:
os:
[
{ base: "linux", distro: "ubuntu-22.04" },
{ base: "linux-musl", distro: "ubuntu-22.04" },
{ base: "mac", distro: "macos-13" }
]
license_type:
@@ -97,7 +98,7 @@ jobs:
- name: Check out repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.event.pull_request.head.sha }}
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup Unix Vars
run: |
@@ -139,7 +140,19 @@ jobs:
- name: Build & Package Unix
run: npm run dist:${{ matrix.license_type.build_prefix }}:${{ env.SHORT_RUNNER_OS }} --quiet
- name: Zip Unix
- name: Zip Linux
if: ${{ env.LOWER_RUNNER_OS == 'linux' }}
run: |
# package MUSL build
mv ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}/cli-alpine bw
zip ../../bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}-musl-${{ env._PACKAGE_VERSION }}.zip ./bw
rm -f ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}/bw
# package glibc build
mv ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}/cli-linux bw
zip ../../bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}-${{ env._PACKAGE_VERSION }}.zip ./bw
- name: Zip macOS
run: |
cd ./dist/${{ matrix.license_type.build_prefix }}/${{ env.LOWER_RUNNER_OS }}
zip ../../bw${{ matrix.license_type.artifact_prefix }}-${{ env.LOWER_RUNNER_OS }}-${{ env._PACKAGE_VERSION }}.zip ./bw
@@ -197,7 +210,7 @@ jobs:
- name: Check out repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.event.pull_request.head.sha }}
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup Windows builder
run: |

View File

@@ -38,12 +38,10 @@
"dist:bit:lin": "npm run build:bit:prod && npm run clean && npm run package:bit:lin",
"package:oss:win": "pkg . --targets win-x64 --output ./dist/oss/windows/bw.exe",
"package:oss:mac": "pkg . --targets macos-x64 --output ./dist/oss/macos/bw",
"package:oss:lin": "pkg . --targets linux-x64 --output ./dist/oss/linux/bw",
"package:oss:lin-musl": "pkg . --targets alpine --output ./dist/oss/linux-musl/bw",
"package:oss:lin": "pkg . --targets linux-x64,alpine --out-dir ./dist/oss/linux",
"package:bit:win": "pkg . --targets win-x64 --output ./dist/bit/windows/bw.exe",
"package:bit:mac": "pkg . --targets macos-x64 --output ./dist/bit/macos/bw",
"package:bit:lin": "pkg . --targets linux-x64 --output ./dist/bit/linux/bw",
"package:bit:lin-musl": "pkg . --targets alpine --output ./dist/bit/linux-musl/bw",
"package:bit:lin": "pkg . --targets linux-x64,alpine --out-dir ./dist/bit/linux",
"test": "jest",
"test:watch": "jest --watch",
"test:watch:all": "jest --watchAll"