Skip to content

Merge v0.2.1-4 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JannikStreek merged 23 commits into from
Dec 23, 2025
Merged

Merge v0.2.1-4 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b2bc63e
build(deps-dev): bump the development-dependencies group across 1 dir…
dependabot[bot] Nov 28, 2025
918f403
build(deps): bump actions/checkout from 4 to 6 (#1078)
dependabot[bot] Nov 28, 2025
969d197
build(deps): bump the production-dependencies group across 1 director…
dependabot[bot] Nov 28, 2025
cbb8f03
build(deps): bump @angular/common from 20.3.7 to 20.3.14 (#1082)
dependabot[bot] Nov 28, 2025
64b94e1
add owner id migration (#1103)
JannikStreek Dec 15, 2025
29c172b
build(deps-dev): bump the development-dependencies group across 1 dir…
dependabot[bot] Dec 15, 2025
3756e84
build(deps): bump the production-dependencies group across 1 director…
dependabot[bot] Dec 15, 2025
2102182
build(deps): bump @fortawesome/free-solid-svg-icons from 6.7.2 to 7.1…
dependabot[bot] Dec 15, 2025
bbc53f1
build(deps): bump @angular/compiler from 20.3.7 to 20.3.15 (#1096)
dependabot[bot] Dec 15, 2025
e2c1484
build(deps): bump @fortawesome/fontawesome-svg-core from 6.7.2 to 7.1…
dependabot[bot] Dec 15, 2025
6559115
build(deps): bump actions/upload-artifact from 4 to 6 (#1100)
dependabot[bot] Dec 15, 2025
744e0ef
build(deps): bump @nx/nx-darwin-x64 from 21.6.5 to 22.1.3 (#1095)
dependabot[bot] Dec 15, 2025
e6ece68
build(deps): bump @nx/nx-win32-x64-msvc from 19.8.4 to 22.1.3 (#1092)
dependabot[bot] Dec 15, 2025
881db39
build(deps): bump @fortawesome/free-brands-svg-icons from 6.7.2 to 7.…
dependabot[bot] Dec 19, 2025
9833c0f
build(deps): bump @nx/nx-linux-x64-gnu from 19.8.2 to 22.1.3 (#1094)
dependabot[bot] Dec 19, 2025
f4d128a
build(deps): bump @nx/nx-darwin-arm64 from 21.2.0 to 22.1.3 (#1093)
dependabot[bot] Dec 19, 2025
8350666
bump backend versions (#1106)
JannikStreek Dec 19, 2025
8eb5fbe
upgrade to angular 21 (#1107)
JannikStreek Dec 19, 2025
e5fdcff
update node version to 25 (#1108)
JannikStreek Dec 19, 2025
26b4562
build(deps-dev): bump the development-dependencies group with 2 updat…
dependabot[bot] Dec 22, 2025
530f616
build(deps): bump the production-dependencies group with 5 updates (#…
dependabot[bot] Dec 22, 2025
89ef67b
merged
JannikStreek Dec 23, 2025
f90685e
fix lint errors
JannikStreek Dec 23, 2025
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
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand All @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand All @@ -46,11 +46,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand All @@ -62,11 +62,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand All @@ -78,11 +78,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand All @@ -95,11 +95,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand All @@ -124,11 +124,11 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand All @@ -153,10 +153,10 @@ jobs:
teammapper-frontend-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: '22'
node-version: '25'

- run: corepack enable
- run: corepack prepare pnpm@9 --activate
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/playwright.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: lts/*
node-version: '25'
- run: corepack enable
- run: corepack prepare pnpm@9 --activate
- name: Install dependencies
Expand All @@ -49,7 +49,7 @@ jobs:
POSTGRES_QUERY_TIMEOUT: 100000
POSTGRES_STATEMENT_TIMEOUT: 100000
BINDING: localhost
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v6
if: ${{ !cancelled() }}
with:
name: playwright
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ ca/*.pem
ca/*.key
ca/*.req

.env.prod
.env.prod
.npmrc
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22-alpine3.19 AS base
FROM node:25-alpine3.22 AS base

RUN apk add --no-cache postgresql-client make g++ python3 py3-pip curl && npm install -g pnpm

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"private": false,
"license": "MIT",
"engines": {
"npm": "~10.7.0",
"node": "~22.12"
"npm": "~10.9.0",
"node": "~25.0"
},
"scripts": {
"dev": "concurrently \"pnpm --filter teammapper-backend start:dev\" \"pnpm --filter teammapper-frontend start\"",
Expand Down
Loading
Loading