Skip to content

Commit 9dd199d

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # .github/workflows/ci.yml # package.json # yarn.lock
2 parents 1391fb4 + 51f3516 commit 9dd199d

File tree

6 files changed

+16151
-378
lines changed

6 files changed

+16151
-378
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,38 @@ jobs:
3838

3939
release:
4040
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
41-
needs: docker
41+
needs: build
4242
runs-on: ubuntu-latest
4343
steps:
4444
- name: Checkout
4545
uses: actions/checkout@v3
46+
with:
47+
fetch-depth: 0
4648
- name: Setup NodeJS
4749
uses: actions/setup-node@v3
4850
with:
4951
node-version: 18
5052
cache: 'yarn'
51-
- run: yarn install --immutable
52-
- run: yarn run release
53+
- run: yarn install
54+
- run: yarn run semantic-release -e semantic-release-monorepo
55+
name: Release Server
56+
working-directory: ./server
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
59+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
60+
- run: yarn up
61+
- run: yarn run semantic-release -e semantic-release-monorepo
62+
name: Release Client
63+
working-directory: ./client
64+
env:
65+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
66+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
67+
- run: yarn up
5368
- run: |
5469
git config --global user.name 'Bot'
5570
git config --global user.email 'info@educorvi.de'
56-
git commit -am "chore: version"
71+
git add -A
72+
git diff-index --quiet HEAD || git commit -am "chore: version[skip-ci]"
5773
git checkout develop
5874
git rebase main
5975
git push

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "timeclicker_client",
3-
"version": "0.0.0",
3+
"version": "1.0.0",
44
"private": true,
55
"scripts": {
66
"dev": "vite --host",

0 commit comments

Comments
 (0)