Skip to content

Commit

Permalink
Merge branch 'release/8.14.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
marteinn committed Oct 30, 2023
2 parents 88a090d + 04952d0 commit 54eab49
Show file tree
Hide file tree
Showing 29 changed files with 900 additions and 808 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: "actions/setup-python@v2"
- uses: actions/checkout@v4
- uses: "actions/setup-python@v4"
with:
python-version: "3.10"
- name: Install cookiecutter
Expand All @@ -18,7 +18,7 @@ jobs:
rm -rf Company-Project
cookiecutter . --no-input
- name: Archive generated-project
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: generated-project
path: ./Company-Project
Expand All @@ -28,10 +28,10 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4
- run: rm -rf Company-Project
- name: Restore generated-project
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: generated-project
path: Company-Project
Expand Down Expand Up @@ -59,13 +59,13 @@ jobs:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: "actions/setup-node@v2"
- uses: actions/checkout@v4
- uses: "actions/setup-node@v4"
with:
node-version: "18"
node-version: "20"
- run: rm -rf Company-Project
- name: Restore generated-project
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: generated-project
path: Company-Project
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
### Removed

## [8.14.0] - 2023-10-30
### Added
- Add Next.js 14.0 support (@marteinn)

### Changed
- Change docker db-name to app to solve ansible issues (@mikaelengstrom)
- Upgrade to Node 20.9 (@marteinn)

### Fixed
- Fix issue with custom serializer not being applied (@saraojelind, @marteinn)
- Rename test in page test template so it drops wording react_representation (@marteinn)
- Upgrade github actions (@marteinn)
- Upgrade storybook to 7.5.2
- Upgrade sentry/nextjs to 7.76.0
- Upgrade eslint-config-next to 14.0.0

### Removed
- Drop `npm run export` as "next export" has been replaced with nextconfig export (@marteinn)

## [8.13.0] - 2023-10-24
### Added
- Add wt/sentry-debug/ endpoint for verifying Sentry integration (@mikaelengstrom)
Expand Down
4 changes: 2 additions & 2 deletions Company-Project/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ executors:
- image: cimg/base:stable-20.04
node:
docker:
- image: cimg/node:18:16
- image: cimg/node:20.9
python:
docker:
- image: cimg/python:3.8.13
Expand Down Expand Up @@ -242,4 +242,4 @@ workflows:
requires:
- frontend
- django

2 changes: 1 addition & 1 deletion Company-Project/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- Python 3.10+
- Pip
- Virtualenv (or the package manage of your choice)
- Node 18
- Node 20
- Docker ([Install instructions](#how-do-i-install-docker-on-macoswindows))
- [mkcert](https://github.com/FiloSottile/mkcert)

Expand Down
2 changes: 1 addition & 1 deletion Company-Project/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ services:
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DB=postgres
- POSTGRES_DB=app
2 changes: 1 addition & 1 deletion Company-Project/frontend/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.16
20.9
Loading

0 comments on commit 54eab49

Please sign in to comment.