Skip to content

Commit df2adeb

Browse files
authored
Merge pull request #251 from educorvi/develop
release fix
2 parents 3618429 + c99ecef commit df2adeb

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
dev-dist
1414
.tsbuildinfo
1515
Dockerfile
16+
**/*.tsbuildinfo

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ on:
88
merge_group:
99
branches: [ develop ]
1010

11+
permissions:
12+
id-token: write # Required for OIDC
13+
pages: write
14+
contents: write
15+
issues: write
16+
pull-requests: write
17+
packages: write
18+
1119
jobs:
1220
build:
1321
runs-on: ubuntu-latest
@@ -61,7 +69,7 @@ jobs:
6169
name: Release Server
6270
working-directory: ./server
6371
env:
64-
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
72+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6573
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
6674
- run: yarn up
6775
- name: Generate license file for client
@@ -71,7 +79,7 @@ jobs:
7179
name: Release Client
7280
working-directory: ./client
7381
env:
74-
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
82+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7583
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
7684
- run: yarn up
7785
- name: Git Settings

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
volumes:
1414
- ./postgres-data:/var/lib/postgresql/data
1515
server:
16-
image: ghcr.io/educorvi/timeclicker:2-latest
16+
image: ghcr.io/educorvi/timeclicker:3-latest
1717
restart: always
1818
depends_on:
1919
- db

0 commit comments

Comments
 (0)