Skip to content

Commit

Permalink
Added some missing changes and CI
Browse files Browse the repository at this point in the history
Signed-off-by: BlackDex <[email protected]>
  • Loading branch information
BlackDex committed Nov 22, 2024
1 parent 1912ee4 commit 4f516a0
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
32 changes: 32 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: CI

on:
pull_request:
paths:
- ".github/workflows/ci.yml"
- "patches/v20*.patch"
- "resources/**"
- "scripts/**"
- "Dockerfile"

jobs:
docker-build:
runs-on: ubuntu-latest
env:
# Force docker to output the progress in plain
BUILDKIT_PROGRESS: plain
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Build and Extract
shell: bash
run: |
make docker-extract
- name: "Upload web-vault artifact"
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: web-vault
compression-level: 0
path: container_builds/bw_web_vault.tar.gz
5 changes: 4 additions & 1 deletion scripts/generate_patch_file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ fi
PATCH_FILENAME="${VAULT_VERSION}.patch"

if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then
git --no-pager diff --no-color --minimal --abbrev=10 -- . \
git add -A
git --no-pager diff --cached --no-color --minimal --abbrev=10 -- . \
':!package-lock.json' \
':!apps/web/src/favicon.ico' \
':!apps/web/src/images/logo.svg' \
':!apps/web/src/images/logo-white.svg' \
':!apps/web/src/images/[email protected]' \
':!apps/web/src/images/[email protected]' \
':!apps/web/src/images/icon-white.png' \
':!apps/web/src/images/icon-dark.png' \
':!apps/web/src/images/icons/android-chrome-192x192.png' \
':!apps/web/src/images/icons/android-chrome-512x512.png' \
':!apps/web/src/images/icons/apple-touch-icon.png' \
Expand All @@ -45,6 +47,7 @@ if [ "$(git status --porcelain | wc -l)" -ge 1 ]; then
':!bitwarden_license/' \
':!apps/web/src/app/tools/access-intelligence/' \
> "../patches/${PATCH_FILENAME}"
git reset -q
echo "Patch has been created here: patches/${PATCH_FILENAME}"
else
echo "No changes found, skip generating a patch file."
Expand Down

0 comments on commit 4f516a0

Please sign in to comment.