From 3719165d1815af45f081a23d076869327fa8b4e8 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:26:38 +0000 Subject: [PATCH 01/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index adde927..f232c12 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -76,14 +76,14 @@ jobs: echo "Gekozen versie: $VERSION" # Stop en verwijder de huidige container - sudo docker stop paypoint || true - sudo docker rm paypoint || true + docker stop paypoint || true + docker rm paypoint || true # Haal de nieuwste image binnen - sudo docker pull veenm/paypoint:$VERSION + docker pull veenm/paypoint:$VERSION # Start een nieuwe container - sudo docker run -d --name paypoint --restart unless-stopped -p 80:15001 veenm/paypoint:$VERSION + docker run -d --name paypoint --restart unless-stopped -p 80:15001 veenm/paypoint:$VERSION # Opruimen oude images - sudo docker image prune -f + docker image prune -f From c88bc19c2674f7911b00410c07222f865684b98e Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:36:55 +0000 Subject: [PATCH 02/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index f232c12..980348c 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -83,7 +83,7 @@ jobs: docker pull veenm/paypoint:$VERSION # Start een nieuwe container - docker run -d --name paypoint --restart unless-stopped -p 80:15001 veenm/paypoint:$VERSION + docker run -d --name paypoint --restart unless-stopped -p 15001:80 veenm/paypoint:$VERSION # Opruimen oude images docker image prune -f From 2b79ccf7a7c2d92494e10685a806698860a78658 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:48:06 +0000 Subject: [PATCH 03/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 980348c..60f997d 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -7,7 +7,28 @@ on: branches: [ "main" ] jobs: + bump-version: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config --global user.name "Gitea Actions" + git config --global user.email "actions@gitea.local" + + - name: Bump version in package.json + run: | + npm version patch --no-git-tag-version + git add package.json package-lock.json + git commit -m "chore: bump version [skip ci]" || echo "No changes to commit" + git push origin main + build-and-push: + needs: bump-version runs-on: ubuntu-latest steps: From 40cef81982fbb2afb422e762b8a31e45fca22b4d Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 08:48:23 +0000 Subject: [PATCH 04/36] chore: bump version [skip ci] --- 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 25dbc11..ea9bf6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.0", + "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.0", + "version": "0.0.1", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index b80b4c7..6ce122e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.0", + "version": "0.0.1", "scripts": { "ng": "ng", "start": "ng serve", From 49ac3c7b8a5f54cbd3549231aa77560f1ae717d5 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:51:40 +0000 Subject: [PATCH 05/36] Add .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .github/workflows/increase-version.yml diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml new file mode 100644 index 0000000..e69de29 From 149bfda41e85931976c376ea3e82070f53e24dd8 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 08:51:53 +0000 Subject: [PATCH 06/36] chore: bump version [skip ci] --- 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 ea9bf6b..896651a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.1", + "version": "0.0.2", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 6ce122e..51f8780 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.1", + "version": "0.0.2", "scripts": { "ng": "ng", "start": "ng serve", From da21c1a1699ffbfe61814a2e879d53fee6fb2529 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:54:40 +0000 Subject: [PATCH 07/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index e69de29..dc7e81a 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -0,0 +1,34 @@ +name: Increase Version + +on: + push: + branches: + - main # Start bij commits op de main branch + +jobs: + bump-version: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config --global user.name "Gitea Actions" + git config --global user.email "actions@gitea.local" + + - name: Bump version + run: | + npm version patch --no-git-tag-version + git add package.json package-lock.json + git commit -m "chore: bump version [skip ci]" || echo "No changes to commit" + git push origin main + + - name: Trigger second pipeline + run: | + curl -X POST "https://git.melvanveen.nl/api/v1/repos/veenm/paypoint/actions/workflows/build-and-deploy.yml/dispatches" \ + -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ + -H "Content-Type: application/json" \ + -d '{"ref":"main"}' From fa1610fbce00368c5a7d58563b580493cc10a732 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 08:54:54 +0000 Subject: [PATCH 08/36] chore: bump version [skip ci] --- 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 896651a..ef83349 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.2", + "version": "0.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.2", + "version": "0.0.3", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 51f8780..3874e23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.2", + "version": "0.0.3", "scripts": { "ng": "ng", "start": "ng serve", From 445eebcb9483a8ea5c5611f347b46b53a9a46819 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:56:00 +0000 Subject: [PATCH 09/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 60f997d..5538985 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -1,11 +1,5 @@ name: Docker Image CI -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - jobs: bump-version: runs-on: ubuntu-latest From fae08d68dbf26973d91b321a443c78144a43f463 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 08:56:16 +0000 Subject: [PATCH 10/36] chore: bump version [skip ci] --- 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 ef83349..a577dfc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.3", + "version": "0.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.3", + "version": "0.0.4", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 3874e23..e9e1be5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.3", + "version": "0.0.4", "scripts": { "ng": "ng", "start": "ng serve", From 679d5fe9f700e3dbeccd81c512f9151b8ab8709e Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 08:56:42 +0000 Subject: [PATCH 11/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 5538985..dc03f72 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -1,5 +1,8 @@ name: Docker Image CI +on: + workflow_dispatch: # Start alleen als het handmatig of via API wordt getriggerd + jobs: bump-version: runs-on: ubuntu-latest From 5282ac51bfc1b2a160f3afc554fd6ac96ec3b228 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 08:56:57 +0000 Subject: [PATCH 12/36] chore: bump version [skip ci] --- 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 a577dfc..2f62c50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.4", + "version": "0.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.4", + "version": "0.0.5", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index e9e1be5..42bc2be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.4", + "version": "0.0.5", "scripts": { "ng": "ng", "start": "ng serve", From 6cd6811e9b6bd02af4e2df51e2a7bba556b31706 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:02:50 +0000 Subject: [PATCH 13/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index dc7e81a..b607fe8 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -29,6 +29,6 @@ jobs: - name: Trigger second pipeline run: | curl -X POST "https://git.melvanveen.nl/api/v1/repos/veenm/paypoint/actions/workflows/build-and-deploy.yml/dispatches" \ - -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ + -H "Authorization: token ${{ secrets.TOKEN }}" \ -H "Content-Type: application/json" \ -d '{"ref":"main"}' From d7b1f1f9c9a68dbea1a79ce58295cc04cff69950 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 09:03:06 +0000 Subject: [PATCH 14/36] chore: bump version [skip ci] --- 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 2f62c50..e63c8ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.5", + "version": "0.0.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.5", + "version": "0.0.6", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 42bc2be..b98ee92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.5", + "version": "0.0.6", "scripts": { "ng": "ng", "start": "ng serve", From cec811029034820199aa93524edb48be3f662d81 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 09:03:37 +0000 Subject: [PATCH 15/36] chore: bump version [skip ci] --- 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 e63c8ba..62f9344 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.6", + "version": "0.0.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.6", + "version": "0.0.7", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index b98ee92..b511b89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.6", + "version": "0.0.7", "scripts": { "ng": "ng", "start": "ng serve", From 411ad800371774c0313f35f02e0e9ddaa9163ce7 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:04:16 +0000 Subject: [PATCH 16/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index dc03f72..c227bcf 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -3,27 +3,7 @@ name: Docker Image CI on: workflow_dispatch: # Start alleen als het handmatig of via API wordt getriggerd -jobs: - bump-version: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Configure Git - run: | - git config --global user.name "Gitea Actions" - git config --global user.email "actions@gitea.local" - - - name: Bump version in package.json - run: | - npm version patch --no-git-tag-version - git add package.json package-lock.json - git commit -m "chore: bump version [skip ci]" || echo "No changes to commit" - git push origin main - +jobs: build-and-push: needs: bump-version runs-on: ubuntu-latest From bec95651f281d3aaf674726fa913b0192f73adc3 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:08:30 +0000 Subject: [PATCH 17/36] Update src/app/services/appointment.service.ts --- src/app/services/appointment.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/services/appointment.service.ts b/src/app/services/appointment.service.ts index 0bb0ff6..17b53a7 100644 --- a/src/app/services/appointment.service.ts +++ b/src/app/services/appointment.service.ts @@ -6,8 +6,8 @@ import {Appointment} from '../models/appointment'; providedIn: 'root', }) export class AppointmentService { - baseApi = "http://localhost:8080/api/appointments"; - // baseApi = "https://api.melvanveen.nl/api/appointments"; + // baseApi = "http://localhost:8080/api/appointments"; + baseApi = "https://api.melvanveen.nl/api/appointments"; constructor(private http: HttpClient) { } From 3a21ac9077ffd17b77cc85f718e15d3d1a4ec22b Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:09:30 +0000 Subject: [PATCH 18/36] Update src/app/services/auth.service.ts --- src/app/services/auth.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 4757e1d..adcb8e8 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -8,8 +8,8 @@ import {jwtDecode} from 'jwt-decode'; providedIn: 'root', }) export class AuthService { - private baseApi = 'http://localhost:8080/api/auth/login'; - // baseApi = "https://api.melvanveen.nl/api/auth/login"; + // private baseApi = 'http://localhost:8080/api/auth/login'; + baseApi = "https://api.melvanveen.nl/api/auth/login"; jwtHelper = new JwtHelperService(); constructor(private http: HttpClient) {} From 49c5d804b0292d2e590b2003cf5ba0b81aca1d5d Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:09:50 +0000 Subject: [PATCH 19/36] Update src/app/services/customer.service.ts --- src/app/services/customer.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/services/customer.service.ts b/src/app/services/customer.service.ts index f83b141..2a22baf 100644 --- a/src/app/services/customer.service.ts +++ b/src/app/services/customer.service.ts @@ -7,8 +7,8 @@ import {Observable} from 'rxjs'; providedIn: 'root', }) export class CustomerService { - baseApi = "http://localhost:8080/api/customers"; - // baseApi = "https://api.melvanveen.nl/api/customers"; + // baseApi = "http://localhost:8080/api/customers"; + baseApi = "https://api.melvanveen.nl/api/customers"; constructor(private http: HttpClient) { From 89f7bedeb3c96b9b5cc41426b3a068d768d1d73f Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 09:10:27 +0000 Subject: [PATCH 20/36] chore: bump version [skip ci] --- 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 62f9344..ef560a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.7", + "version": "0.0.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.7", + "version": "0.0.8", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index b511b89..23878e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.7", + "version": "0.0.8", "scripts": { "ng": "ng", "start": "ng serve", From a57bdf6fedeedf6fa2a2a599e7ad323d678b6025 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:16:26 +0000 Subject: [PATCH 21/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index b607fe8..f76d5c7 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -28,7 +28,7 @@ jobs: - name: Trigger second pipeline run: | - curl -X POST "https://git.melvanveen.nl/api/v1/repos/veenm/paypoint/actions/workflows/build-and-deploy.yml/dispatches" \ + curl -X POST "https://git.melvanveen.nl/api/v1/repos/veenm/paypoint/actions/workflows/deploy-docker.yml/dispatches" \ -H "Authorization: token ${{ secrets.TOKEN }}" \ -H "Content-Type: application/json" \ -d '{"ref":"main"}' From 4e8cac7581f534523eb0310b99aa2cad7ed75dc9 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 09:16:41 +0000 Subject: [PATCH 22/36] chore: bump version [skip ci] --- 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 ef560a5..791aab9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.8", + "version": "0.0.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.8", + "version": "0.0.9", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 23878e2..ea206cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.8", + "version": "0.0.9", "scripts": { "ng": "ng", "start": "ng serve", From db2e36810678cd28415390cce7550676fa0d0f46 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:23:57 +0000 Subject: [PATCH 23/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index c227bcf..91db691 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -1,8 +1,5 @@ name: Docker Image CI -on: - workflow_dispatch: # Start alleen als het handmatig of via API wordt getriggerd - jobs: build-and-push: needs: bump-version From be2e344a0e335e17c33a554796ea616c67a30012 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 09:24:11 +0000 Subject: [PATCH 24/36] chore: bump version [skip ci] --- 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 791aab9..a016d9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.9", + "version": "0.0.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.9", + "version": "0.0.10", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index ea206cf..3ad9108 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.9", + "version": "0.0.10", "scripts": { "ng": "ng", "start": "ng serve", From c34172baff206c450951d620fc8c30cf6118b5b5 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 09:59:31 +0000 Subject: [PATCH 25/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 91db691..ec86b6a 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -1,5 +1,8 @@ name: Docker Image CI +on: + workflow_dispatch: + jobs: build-and-push: needs: bump-version From f21b18303cd7098365e0fb33178e3bc51c388e95 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 10:00:12 +0000 Subject: [PATCH 26/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index ec86b6a..3c5438e 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -5,7 +5,6 @@ on: jobs: build-and-push: - needs: bump-version runs-on: ubuntu-latest steps: From 7e9be09d49c6243a852c83bac0e0aacabe448606 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 12:26:20 +0000 Subject: [PATCH 27/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index f76d5c7..bd6ce3f 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -32,3 +32,5 @@ jobs: -H "Authorization: token ${{ secrets.TOKEN }}" \ -H "Content-Type: application/json" \ -d '{"ref":"main"}' + build-and-run: + uses: veenm/paypoint/.github/workflows/deploy-docker.yml@main From ba203b5d12e61d927411fa4ec9a64c273efe8679 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 12:26:27 +0000 Subject: [PATCH 28/36] chore: bump version [skip ci] --- 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 a016d9e..023ffd7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.10", + "version": "0.0.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.10", + "version": "0.0.11", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 3ad9108..4072414 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.10", + "version": "0.0.11", "scripts": { "ng": "ng", "start": "ng serve", From d020a12c40f5d8bfb09bf0e9809d859a2d02ede1 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 12:32:54 +0000 Subject: [PATCH 29/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index bd6ce3f..33581c9 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -24,6 +24,11 @@ jobs: npm version patch --no-git-tag-version git add package.json package-lock.json git commit -m "chore: bump version [skip ci]" || echo "No changes to commit" + + # Pull the latest changes from the remote main branch before pushing + git pull origin main --rebase + + # Push changes to remote main branch git push origin main - name: Trigger second pipeline From 675aad7fd0d7af36e8b41408f999a23e1eafacf6 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 12:33:06 +0000 Subject: [PATCH 30/36] chore: bump version [skip ci] --- 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 023ffd7..e3a6940 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.11", + "version": "0.0.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.11", + "version": "0.0.12", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 4072414..ba404d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.11", + "version": "0.0.12", "scripts": { "ng": "ng", "start": "ng serve", From 8e0b37398022c1b56a18ce7961088d73f78a7e48 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 12:36:38 +0000 Subject: [PATCH 31/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index 33581c9..c19573e 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -31,11 +31,5 @@ jobs: # Push changes to remote main branch git push origin main - - name: Trigger second pipeline - run: | - curl -X POST "https://git.melvanveen.nl/api/v1/repos/veenm/paypoint/actions/workflows/deploy-docker.yml/dispatches" \ - -H "Authorization: token ${{ secrets.TOKEN }}" \ - -H "Content-Type: application/json" \ - -d '{"ref":"main"}' build-and-run: uses: veenm/paypoint/.github/workflows/deploy-docker.yml@main From f6e90f4519431af16847b9494cddac6c8d250485 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 12:36:52 +0000 Subject: [PATCH 32/36] chore: bump version [skip ci] --- 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 e3a6940..85880af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.12", + "version": "0.0.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.12", + "version": "0.0.13", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index ba404d2..5203ca4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.12", + "version": "0.0.13", "scripts": { "ng": "ng", "start": "ng serve", From c740997861155bfd96587b106587b15d2d45c56b Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 12:40:09 +0000 Subject: [PATCH 33/36] Update .github/workflows/deploy-docker.yml --- .github/workflows/deploy-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml index 3c5438e..eeeee0d 100644 --- a/.github/workflows/deploy-docker.yml +++ b/.github/workflows/deploy-docker.yml @@ -1,7 +1,7 @@ name: Docker Image CI on: - workflow_dispatch: + workflow_call: jobs: build-and-push: From 5fe4595a03f9cf9453de97330811f97707993966 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 12:40:22 +0000 Subject: [PATCH 34/36] chore: bump version [skip ci] --- 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 85880af..7346ebf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.13", + "version": "0.0.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.13", + "version": "0.0.14", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 5203ca4..8c5cfff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.13", + "version": "0.0.14", "scripts": { "ng": "ng", "start": "ng serve", From a1378ab6a8bf5c7ea7228b56d330d6895ce86fd3 Mon Sep 17 00:00:00 2001 From: veenm Date: Wed, 12 Mar 2025 12:41:29 +0000 Subject: [PATCH 35/36] Update .github/workflows/increase-version.yml --- .github/workflows/increase-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/increase-version.yml b/.github/workflows/increase-version.yml index c19573e..62de3e4 100644 --- a/.github/workflows/increase-version.yml +++ b/.github/workflows/increase-version.yml @@ -32,4 +32,4 @@ jobs: git push origin main build-and-run: - uses: veenm/paypoint/.github/workflows/deploy-docker.yml@main + uses: ./.github/workflows/deploy-docker.yml@main From cb3243e5244f3626184e8bbec0aa5ce7494c0eb9 Mon Sep 17 00:00:00 2001 From: Gitea Actions Date: Wed, 12 Mar 2025 12:41:44 +0000 Subject: [PATCH 36/36] chore: bump version [skip ci] --- 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 7346ebf..4871bf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pay-point", - "version": "0.0.14", + "version": "0.0.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pay-point", - "version": "0.0.14", + "version": "0.0.15", "dependencies": { "@angular/animations": "^19.0.0", "@angular/cdk": "^19.0.0", diff --git a/package.json b/package.json index 8c5cfff..5e2a9b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pay-point", - "version": "0.0.14", + "version": "0.0.15", "scripts": { "ng": "ng", "start": "ng serve",