From fd9dc302cbf117aadffb7849865c8185aa894eac Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:40:57 +0200 Subject: [PATCH 1/8] Get version from package.json --- src/app/about/about.component.ts | 4 ++-- src/app/app.component.ts | 9 +++++---- src/app/profile/profile.component.ts | 1 - src/app/settings/settings.component.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 3d293a4..26596b4 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core' import { ConfigService } from '../config.service' -import versionJson from '../../version.json' +import packageJson from '../../../package.json' @Component({ selector: 'app-about', @@ -13,7 +13,7 @@ export class AboutComponent implements OnInit { public configService: ConfigService, ) { } - public version: string = versionJson.version + public version: string = packageJson.version ngOnInit(): void { } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 52a84ae..70dc380 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,7 @@ -import { Component, OnInit, - ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core' +import { + Component, OnInit, + ChangeDetectorRef, ChangeDetectionStrategy +} from '@angular/core' import { DataService } from './data.service' import { ActionService } from './action.service' @@ -10,7 +12,6 @@ import { combineLatest } from 'rxjs' @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) export class AppComponent implements OnInit { @@ -20,7 +21,7 @@ export class AppComponent implements OnInit { public actionService: ActionService, public appUpdateService: AppUpdateService, public cdr: ChangeDetectorRef, - ) {} + ) { } title = 'treetrail' ngOnInit(): void { diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts index 16fa22f..c5b8ea6 100644 --- a/src/app/profile/profile.component.ts +++ b/src/app/profile/profile.component.ts @@ -3,7 +3,6 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-profile', templateUrl: './profile.component.html', - styleUrls: ['./profile.component.scss'] }) export class ProfileComponent { diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index 44c1f14..9157906 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router' import { ActionService } from '../action.service' import { ConfigService, Config } from '../config.service' -import versionJson from '../../version.json' +import packageJson from '../../../package.json' @Component({ selector: 'app-settings', @@ -18,7 +18,7 @@ export class SettingsComponent implements OnInit { public router: Router, ) { } - public version: string = versionJson.version + public version: string = packageJson.version ngOnInit(): void { this.configService.conf.subscribe( From 674fd71de9916d2ac24f2b9084fcff6fdcb57a0a Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:41:27 +0200 Subject: [PATCH 2/8] CI: use pnpm-python builder --- .woodpecker/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index bb78fa7..b5c087b 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -7,7 +7,7 @@ when: steps: npm: - image: code.philo.ydns.eu/philorg/pnpm + image: code.philo.ydns.eu/philorg/pnpm-python environment: ORG: philorg REGISTRY_TOKEN: From f5828ae1e6d26069ea70ce7621700e8522fc39d6 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:41:52 +0200 Subject: [PATCH 3/8] 0.4.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7da953c..7c63733 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.2", + "version": "0.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.2", + "version": "0.4.3", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 5eea59d..cc72d00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.2", + "version": "0.4.3", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From b6c4cd280a684b1db593f633f15a9978ab29a095 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:47:04 +0200 Subject: [PATCH 4/8] CI: force pull builder --- .woodpecker/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index b5c087b..d2ce4a3 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -8,6 +8,7 @@ when: steps: npm: image: code.philo.ydns.eu/philorg/pnpm-python + pull: true environment: ORG: philorg REGISTRY_TOKEN: From 20bfd3116ef19f8f72a4e7d1fcd606c0642c2670 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:47:14 +0200 Subject: [PATCH 5/8] 0.4.4 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c63733..7115ee1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.3", + "version": "0.4.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.3", + "version": "0.4.4", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index cc72d00..1c9d05c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.3", + "version": "0.4.4", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From 14363c721b1d8cb2ece9a53ac808ae36292577ea Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 03:19:46 +0200 Subject: [PATCH 6/8] CI: use debian based builder --- .woodpecker/build.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index d2ce4a3..f6a4c09 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -7,8 +7,7 @@ when: steps: npm: - image: code.philo.ydns.eu/philorg/pnpm-python - pull: true + image: code.philo.ydns.eu/philorg/pnpm-deb environment: ORG: philorg REGISTRY_TOKEN: @@ -33,7 +32,7 @@ steps: environment: registry: code.philo.ydns.eu org: philorg - container_name: oidc-vue-test + container_name: treetrail-frontend registry_token: from_secret: registry_token commands: From 034d9d4c3717ef28a2fda8cbb752c3d801e4c434 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 03:19:56 +0200 Subject: [PATCH 7/8] 0.4.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7115ee1..91aa9a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.4", + "version": "0.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.4", + "version": "0.4.5", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 1c9d05c..b408455 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.4", + "version": "0.4.5", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From 5c22207f0a0726014693acd4390c5a610ced6cf8 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 03:40:22 +0200 Subject: [PATCH 8/8] CI: build ts --- .woodpecker/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index f6a4c09..24c4254 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -20,6 +20,11 @@ steps: - pnpm publish --no-git-checks failure: ignore + build: + image: code.philo.ydns.eu/philorg/pnpm-deb + commands: + - pnpm build + build_publish: image: quay.io/podman/stable:latest # Caution: This image is built daily. It might fill up your image store quickly.