From 1bf7ef7e28fca3863c52c1457d1bf03337ff945e Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:30:05 +0100 Subject: [PATCH 1/5] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 105c00f..ee6bec4 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ testem.log # System Files .DS_Store Thumbs.db + +.npmrc From 6949d96117259e0d4217299369057c1cae90d85f Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:31:22 +0100 Subject: [PATCH 2/5] Add my registry to package.json --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 43ef986..8b6ab4f 100644 --- a/package.json +++ b/package.json @@ -62,5 +62,8 @@ "karma-jasmine-html-reporter": "^2.1.0", "typescript": "~5.4.5" }, - "packageManager": "pnpm@9.12.2" + "packageManager": "pnpm@9.12.2", + "publishConfig": { + "registry": "http://code.philo.ydns.eu/repository/npmjs" + } } From fd6e67b33262d9939cc2e702d2e735a11a9816ea Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:33:34 +0100 Subject: [PATCH 3/5] Add my registry to package.json fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b6ab4f..56fffca 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,6 @@ }, "packageManager": "pnpm@9.12.2", "publishConfig": { - "registry": "http://code.philo.ydns.eu/repository/npmjs" + "registry": "http://code.philo.ydns.eu/api/packages/philorg/npm/" } } From ed1a9242c98fb8ff1ed565e78f83c047b52b32ad Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:34:44 +0100 Subject: [PATCH 4/5] Remove private in package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 56fffca..8537246 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "openapi-ts": "openapi-ts", "version": "echo \"{\\\"version\\\":\\\"$(git describe --tags --dirty --always)\\\"}\" > src/version.json" }, - "private": true, "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", From 6aaf93b0985daed7460c05ff034549ebb318c256 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:43:54 +0100 Subject: [PATCH 5/5] CI: set version dynamically --- .forgejo/workflows/build.yaml | 9 +++++++++ package.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 4ac6fc9..080e390 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -53,9 +53,18 @@ jobs: - name: Update version.json from git describe run: pnpm run version + - name: Set the version in package.json + env: + VERSION: ${{ steps.version.outputs.version }} + run: sed "s/0.0.0/${VERSION}/" -i package.json + - name: Build package (transpile ts => js) run: ng build + - name: Publish + if: fromJSON(steps.builder.outputs.run) + run: pnpm publish + - name: Build container if: fromJSON(steps.builder.outputs.run) uses: actions/buildah-build@v1 diff --git a/package.json b/package.json index 8537246..6b0a851 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "treetrail", - "version": "0.0.3", + "name": "treetrail-frontend", + "version": "0.0.0", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail",