From 33f27c2b3cc5dc7da60e3a1436a2960a4e21367a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 17 Jul 2024 07:29:35 +0000 Subject: [PATCH 1/5] Prepare release v1.0.1 --- CHANGELOG.md | 34 +++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0376980..c710ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,24 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.0.1] - 2024-07-17 + ## [v1.0.0] - 2024-07-06 ### Added -- feat: update readme (#25) -- feat: add stakeholder section as slider (#26) -- feat: add introduction section (#30) -- feat: add favicons (#31) -- feat: add current process section (#36) -- feat: add project page (#41) -- feat: add dashboard preview section (#43) -- feat: add advantages section (#45) -- feat: add contact section (#46) -- feat: add homepage hero (#50) -- feat: add contact page (#53) -- feat: add not found page (#54) -- feat: add hero homepage overlays (#56) -- feat: add background to sections (#59) +- feat: update readme (#25) +- feat: add stakeholder section as slider (#26) +- feat: add introduction section (#30) +- feat: add favicons (#31) +- feat: add current process section (#36) +- feat: add project page (#41) +- feat: add dashboard preview section (#43) +- feat: add advantages section (#45) +- feat: add contact section (#46) +- feat: add homepage hero (#50) +- feat: add contact page (#53) +- feat: add not found page (#54) +- feat: add hero homepage overlays (#56) +- feat: add background to sections (#59) ### Changed @@ -38,7 +40,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial release - Create "Page under construction" Page -[Unreleased]: https://github.com/green-ecolution/project-website/compare/v1.0.0...HEAD +[Unreleased]: https://github.com/green-ecolution/project-website/compare/v1.0.1...HEAD + +[v1.0.1]: https://github.com/green-ecolution/project-website/compare/v1.0.0...v1.0.1 [v1.0.0]: https://github.com/green-ecolution/project-website/compare/v0.0.1...v1.0.0 diff --git a/package.json b/package.json index 6163014..1eff671 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "project-website", "private": true, - "version": "v1.0.0", + "version": "v1.0.1", "type": "module", "scripts": { "dev": "vite", From 144b45747900d61fad8718c5cc55ba808e502865 Mon Sep 17 00:00:00 2001 From: Cedrik Hoffmann Date: Wed, 17 Jul 2024 09:43:13 +0200 Subject: [PATCH 2/5] docs: edit changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c710ee0..c2dec5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v1.0.1] - 2024-07-17 +### Changed + +- chore: update organization name in code, docs and ci/cd + ## [v1.0.0] - 2024-07-06 ### Added From 4636df7cef495968fdfa9b3bb021623c2c4f5d99 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 17 Jul 2024 07:46:19 +0000 Subject: [PATCH 3/5] Update stage image to commit 144b457 --- k8s/values/stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/values/stage.yaml b/k8s/values/stage.yaml index ad790e6..a1aed2a 100644 --- a/k8s/values/stage.yaml +++ b/k8s/values/stage.yaml @@ -5,7 +5,7 @@ deployment: image: repository: ghcr.io/green-ecolution/project-website-stage pullPolicy: Always - tag: 92fdc8d + tag: 144b457 ingress: enabled: true className: "traefik" From b15b3871931c50c5b484f0c449a70c708c4b5053 Mon Sep 17 00:00:00 2001 From: Cedrik Hoffmann Date: Wed, 17 Jul 2024 10:00:04 +0200 Subject: [PATCH 4/5] chore: dump version in helm chart --- k8s/values/prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/values/prod.yaml b/k8s/values/prod.yaml index 38bf5e4..7fed7ff 100644 --- a/k8s/values/prod.yaml +++ b/k8s/values/prod.yaml @@ -5,7 +5,7 @@ deployment: image: repository: ghcr.io/green-ecolution/project-website pullPolicy: Always - tag: v1.0.0 + tag: v1.0.1 ingress: enabled: true From 71d0aaf2fd9574746e4e236e0a2f50e5111a800e Mon Sep 17 00:00:00 2001 From: Cedrik Hoffmann Date: Wed, 17 Jul 2024 10:04:47 +0200 Subject: [PATCH 5/5] ci: fix missing dump version on prod and change commit messages in workflow --- .github/workflows/build-and-push-develop.yml | 2 +- .../workflows/build-and-push-production.yml | 28 +++++++++++++++++++ .github/workflows/build-and-push-stage.yml | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-push-develop.yml b/.github/workflows/build-and-push-develop.yml index ff605c1..7a29167 100644 --- a/.github/workflows/build-and-push-develop.yml +++ b/.github/workflows/build-and-push-develop.yml @@ -65,7 +65,7 @@ jobs: id: make-commit run: | git add ./k8s/values/develop.yaml - git commit --message "Update dev image to commit ${{ env.COMMIT_SHA }}" + git commit --message "chore: update dev image to commit ${{ env.COMMIT_SHA }}" echo "::set-output name=commit::$(git rev-parse HEAD)" diff --git a/.github/workflows/build-and-push-production.yml b/.github/workflows/build-and-push-production.yml index 3ffeab7..d8ab2b9 100644 --- a/.github/workflows/build-and-push-production.yml +++ b/.github/workflows/build-and-push-production.yml @@ -87,3 +87,31 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: ghcr.io/${{ env.REPO_LC }}:${{ env.RELEASE_VERSION }}, ghcr.io/${{ env.REPO_LC }}:latest + + - name: "Setup yq" + uses: dcarbone/install-yq-action@v1.1.1 + with: + version: "v4.42.1" + force: true + + - name: Initialize mandatory git config + run: | + git config --global user.name 'GitHub Actions' + git config --global user.email 'noreply@github.com' + + - name: Bump version in values/develop.yaml + run: yq -i '.deployment.image.tag=strenv(RELEASE_VERSION)' ./k8s/values/prod.yaml + + - name: Commit k8s values files + id: make-commit + run: | + git add ./k8s/values/prod.yaml + git commit --message "chore: update prod image to version ${{ env.RELEASE_VERSION }}" + + echo "::set-output name=commit::$(git rev-parse HEAD)" + + - name: Push changes + uses: CasperWA/push-protected@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + branch: develop diff --git a/.github/workflows/build-and-push-stage.yml b/.github/workflows/build-and-push-stage.yml index dcee647..c8b6623 100644 --- a/.github/workflows/build-and-push-stage.yml +++ b/.github/workflows/build-and-push-stage.yml @@ -104,7 +104,7 @@ jobs: id: make-commit run: | git add ./k8s/values/stage.yaml - git commit --message "Update stage image to commit ${{ env.COMMIT_SHA }}" + git commit --message "chore: update stage image to commit ${{ env.COMMIT_SHA }}" echo "::set-output name=commit::$(git rev-parse HEAD)"