Skip to content

Commit

Permalink
Merge pull request #590 from p2pu/2024-react-18
Browse files Browse the repository at this point in the history
2024 react 18
  • Loading branch information
dirkcuys authored Apr 4, 2024
2 parents 36401c1 + 2d021de commit 9837ae8
Show file tree
Hide file tree
Showing 6 changed files with 28,320 additions and 5,076 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/website-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: cat ./_data/teams.json | python3 _deploy/team_pages.py

- name: build frontend
run: docker run --rm --volume `pwd`:/opt/app --workdir /opt/app node:14 /bin/sh -c "npm install && npm run build"
run: docker run --rm --volume `pwd`:/opt/app --workdir /opt/app node:20 /bin/sh -c "npm install && npm run build"

- name: build jekyll site
run: docker run -v `pwd`:/opt/app -v `pwd`/_site:/opt/app/_site local/p2pu-website jekyll build --future --config _config.yml,_production.yml
Expand All @@ -59,7 +59,7 @@ jobs:
run: docker network create test-net

- name: test setup
run: docker run --name site --workdir /tmp -d --network test-net --publish 3000:3000 --volume `pwd`/_site:/var/www node:14 /bin/sh -c "npm i serve && npx serve -l 3000 /var/www"
run: docker run --name site --workdir /tmp -d --network test-net --publish 3000:3000 --volume `pwd`/_site:/var/www node:20 /bin/sh -c "npm i serve && npx serve -l 3000 /var/www"

- name: build docker image for testing with puppeteer
run: docker build ./docker/puppeteer/ -t local/puppeteer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/website-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ jobs:
run: cat ./_data/teams.json | python3 _deploy/team_pages.py

- name: build frontend
run: docker run --rm --volume `pwd`:/opt/app --workdir /opt/app node:14 /bin/sh -c "npm install && npm run build"
run: docker run --rm --volume `pwd`:/opt/app --workdir /opt/app node:20 /bin/sh -c "npm install && npm run build"

- name: build jekyll site
run: docker run -v `pwd`:/opt/app -v `pwd`/_site:/opt/app/_site local/p2pu-website jekyll build --future --config _config.yml,_production.yml

- name: test setup
run: docker run --name=site -d --volume `pwd`/_site:/var/www node:14 /bin/sh -c "npm i serve && npx serve -l 3000 /var/www"
run: docker run --name=site -d --volume `pwd`/_site:/var/www node:20 /bin/sh -c "npm i serve && npx serve -l 3000 /var/www"

- name: build docker image for testing using puppeteer
run: docker build ./docker/puppeteer/ -t local/puppeteer
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- BUNDLE_PATH=/opt/bundler
command: bundle exec jekyll serve -H 0.0.0.0 --watch --config _config.yml,_config.dev.yml
node:
image: node:14
image: node:20
user: 1000:1000
working_dir: /opt/app
#ports:
Expand Down
2 changes: 1 addition & 1 deletion p2pu-components
Submodule p2pu-components updated 134 files
Loading

0 comments on commit 9837ae8

Please sign in to comment.