Skip to content

Commit 2149870

Browse files
renovate[bot]dawsontoth
authored andcommitted
chore(deps): update dependency @testing-library/jest-dom to v6.9.1
1 parent f7aeb71 commit 2149870

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

.github/workflows/deploy-dev.yaml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
name: Deploy to Dev
1+
name: Deploy to Stage
22
on:
33
workflow_dispatch:
44
push:
55
branches:
66
- dev
7+
merge_group:
8+
branches:
9+
- dev
710

811
concurrency:
9-
group: dev
10-
cancel-in-progress: false
12+
group: stage-${{ github.event_name }}-${{ github.ref || github.head_ref }}
13+
cancel-in-progress: ${{ github.event_name != 'push' }}
1114

1215
jobs:
13-
deployToDev:
16+
deployToStage:
1417
runs-on: ubuntu-latest
18+
permissions:
19+
contents: write
1520
steps:
1621
- name: Checkout code
1722
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -32,16 +37,24 @@ jobs:
3237
run: pnpm test
3338
- name: Run lint
3439
run: pnpm lint
40+
- name: Verify stage can build
41+
run: pnpm build:stage
3542
- name: Determine version tag for build
43+
if: ${{ github.event_name == 'push' }}
3644
run: |
37-
VERSION_TAG="SHA-${GITHUB_SHA:0:7}"
45+
VERSION_TAG=$(git tag --points-at HEAD | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n1)
46+
if [ -z "$VERSION_TAG" ]; then
47+
VERSION_TAG="v0.0.0+${GITHUB_SHA:0:7}"
48+
fi
3849
echo "VITE_STUDIO_VERSION=$VERSION_TAG" >> $GITHUB_ENV
39-
- name: Build dev
40-
run: pnpm build:dev
41-
- name: Deploy to dev
50+
- name: Build stage for release
51+
if: ${{ github.event_name == 'push' }}
52+
run: pnpm build:stage
53+
- name: Deploy to stage
54+
if: ${{ github.event_name == 'push' }}
4255
run: |
4356
mkdir deploy
4457
mv web deploy/
4558
cp -R deploy-template/* deploy/
4659
cd deploy
47-
CLI_TARGET_USERNAME=${{ secrets.CLI_TARGET_USERNAME_DEV }} CLI_TARGET_PASSWORD='${{ secrets.HARPERDB_CLI_TARGET_PASSWORD_DEV }}' pnpm harperdb deploy_component project=hdbms target='${{ secrets.CLI_DEPLOY_TARGET_DEV }}' restart=false replicated=true
60+
CLI_TARGET_USERNAME=${{ secrets.CLI_TARGET_USERNAME }} CLI_TARGET_PASSWORD='${{ secrets.HARPERDB_CLI_TARGET_PASSWORD }}' pnpm harperdb deploy_component project=hdbms target='${{ secrets.CLI_DEPLOY_TARGET }}' restart=rolling replicated=true

pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)