Skip to content

Commit

Permalink
Merge pull request #68 from SmartCityFlensburg/main
Browse files Browse the repository at this point in the history
Merge main into develop branch
  • Loading branch information
choffmann authored Jul 6, 2024
2 parents 87874d8 + 5922f3d commit bfa1423
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-and-push-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
if: github.event_name == 'push'
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: release/${{ github.event.inputs.version }}
branch: release/${{ env.RELEASE_VERSION }}

- name: Push changes
uses: CasperWA/push-protected@v2
Expand All @@ -125,9 +125,9 @@ jobs:
- name: Delete tag
uses: dev-drprasad/[email protected]
with:
tag_name: stage-deployment
tag_name: stage-deployment
delete_release: false
github_token: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Create tag
run: git tag -fa 'stage-deployment' -m "Update tag to commit ${{ env.COMMIT_SHA }}"
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ jobs:
- name: Bump version in package.json
run: yarn version --new-version ${{ github.event.inputs.version }} --no-git-tag-version

- name: "Setup yq"
uses: dcarbone/[email protected]
with:
version: "v4.42.1"
force: true

- name : Bump version in values/prod.yaml
run: |
yq -i '.deployment.image.tag="${{ github.event.inputs.version }}"' ./k8s/values/prod.yaml
- name: Commit changelog and manifest files
id: make-commit
run: |
Expand All @@ -54,7 +64,7 @@ jobs:
head: release/${{ github.event.inputs.version }}
base: main
title: Release version ${{ github.event.inputs.version }}
reviewers: ${{ github.actor }}
reviewers: ${{ github.actor }}
body: |
Hi @${{ github.actor }}! 👋
Expand Down Expand Up @@ -142,8 +152,8 @@ jobs:
- name: Delete tag
uses: dev-drprasad/[email protected]
with:
tag_name: stage-deployment
github_token: ${{ secrets.GITHUB_TOKEN }}
tag_name: stage-deployment
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Create tag
run: git tag -fa 'stage-deployment' -m "Update tag to commit ${{ env.COMMIT_SHA }}"
Expand Down
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

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

### Changed

- Improve CI/CD pipeline for deployment, staging and production
Expand All @@ -19,6 +38,8 @@ 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/SmartCityFlensburg/project-website/compare/v0.0.1...HEAD
[Unreleased]: https://github.com/SmartCityFlensburg/project-website/compare/v1.0.0...HEAD

[v1.0.0]: https://github.com/SmartCityFlensburg/project-website/compare/v0.0.1...v1.0.0

[v0.0.1]: https://github.com/SmartCityFlensburg/project-website/releases/tag/v0.0.1
3 changes: 1 addition & 2 deletions k8s/values/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ deployment:
image:
repository: ghcr.io/smartcityflensburg/project-website
pullPolicy: Always
tag: latest

tag: v1.0.0

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/smartcityflensburg/project-website-stage
pullPolicy: Always
tag: 2c30d74
tag: 92fdc8d
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": "v0.0.1",
"version": "v1.0.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down

0 comments on commit bfa1423

Please sign in to comment.