Skip to content

Commit

Permalink
Merge pull request #218 from nerdstrike/update_toolchain
Browse files Browse the repository at this point in the history
Update toolchain
  • Loading branch information
mgcam authored Apr 3, 2024
2 parents 25ce043 + 8535d01 commit f23828c
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 17 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/deploy-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
DB_URL: "mysql+pymysql://q:q@q/q"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Poetry
run: |
pipx install poetry
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: 'x64'
Expand All @@ -27,14 +27,13 @@ jobs:
run: |
poetry env use '3.10'
poetry install
- name: Build openapi.json
run: |
mkdir gh_pages
poetry run python -c "from lang_qc.main import app; import json; output = open('gh-pages/openapi.json', 'w'); json.dump(app.openapi(), output); output.close()"
- name: Deploy github pages
uses: JamesIves/github-pages-deploy-action@v4.3.3
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
branch: gh-pages
folder: gh-pages
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Poetry
run: |
pipx install poetry
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: 'x64'
Expand All @@ -41,7 +41,7 @@ jobs:
run: |
poetry run isort --check --diff --color .
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:

- name: Check out repository code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: 'x64'
Expand Down Expand Up @@ -59,13 +59,13 @@ jobs:
MYSQL_DATABASE: "langqc"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Poetry
run: |
pipx install poetry
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: '3.10'
architecture: 'x64'
Expand All @@ -82,10 +82,10 @@ jobs:
test-frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
- run: npm install
working-directory: ./frontend
- run: npm run test
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-alpine as base-stage
FROM node:20-alpine as base-stage

COPY package.json /code/longue_vue/

Expand Down
3 changes: 3 additions & 0 deletions frontend/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"exclude": ["node_modules"]
}
1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"node": ">=16.16.0",
"npm": ">=8.11.0"
},
"type": "module",
"scripts": {
"dev": "vite --port 3000",
"build": "vite build",
Expand Down

0 comments on commit f23828c

Please sign in to comment.