Skip to content
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.

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

Merge main into develop branch #73

Merged
merged 7 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/build-and-push-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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 '[email protected]'

- 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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
38 changes: 23 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v1.0.1] - 2024-07-17

### Changed

- chore: update organization name in code, docs and ci/cd

## [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

Expand All @@ -38,7 +44,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

Expand Down
2 changes: 1 addition & 1 deletion k8s/values/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion k8s/values/stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ deployment:
image:
repository: ghcr.io/green-ecolution/project-website-stage
pullPolicy: Always
tag: 28d5d8a
tag: 144b457
ingress:
enabled: true
className: "traefik"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "project-website",
"private": true,
"version": "v1.0.0",
"version": "v1.0.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
Loading