Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
dev-dist
.tsbuildinfo
Dockerfile
**/*.tsbuildinfo
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ on:
merge_group:
branches: [ develop ]

permissions:
id-token: write # Required for OIDC
pages: write
contents: write
issues: write
pull-requests: write
packages: write

jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -61,7 +69,7 @@ jobs:
name: Release Server
working-directory: ./server
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: yarn up
- name: Generate license file for client
Expand All @@ -71,7 +79,7 @@ jobs:
name: Release Client
working-directory: ./client
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: yarn up
- name: Git Settings
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
volumes:
- ./postgres-data:/var/lib/postgresql/data
server:
image: ghcr.io/educorvi/timeclicker:2-latest
image: ghcr.io/educorvi/timeclicker:3-latest
restart: always
depends_on:
- db
Expand Down
Loading