github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-21 17:26:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: use npm tasks instead of running turbo directly

Browse source 
Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2023-09-07 19:56:20 +02:00
parent 785ef316ab
commit 6263af5ee2
8 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/e2e-tests.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
NODEJS_VERSION: ${{ env.NODEJS_VERSION }} NODEJS_VERSION: ${{ env.NODEJS_VERSION }}
- name: Run e2e tests - name: Run e2e tests
run: yarn turbo run test:e2e:ci --filter=backend run: yarn test:e2e:ci --filter=backend
shell: bash shell: bash
env: env:
HEDGEDOC_TEST_DB_TYPE: sqlite HEDGEDOC_TEST_DB_TYPE: sqlite
@ -78,7 +78,7 @@ jobs:
NODEJS_VERSION: ${{ env.NODEJS_VERSION }} NODEJS_VERSION: ${{ env.NODEJS_VERSION }}
- name: Run e2e tests - name: Run e2e tests
run: yarn turbo run test:e2e:ci --filter=backend run: yarn test:e2e:ci --filter=backend
shell: bash shell: bash
env: env:
HEDGEDOC_TEST_DB_TYPE: mariadb HEDGEDOC_TEST_DB_TYPE: mariadb
@ -109,7 +109,7 @@ jobs:
NODEJS_VERSION: ${{ env.NODEJS_VERSION }} NODEJS_VERSION: ${{ env.NODEJS_VERSION }}
- name: Run e2e tests - name: Run e2e tests
run: yarn turbo run test:e2e:ci --filter=backend run: yarn test:e2e:ci --filter=backend
shell: bash shell: bash
env: env:
HEDGEDOC_TEST_DB_TYPE: postgres HEDGEDOC_TEST_DB_TYPE: postgres
@ -133,7 +133,7 @@ jobs:
NODEJS_VERSION: ${{ env.NODEJS_VERSION }} NODEJS_VERSION: ${{ env.NODEJS_VERSION }}
- name: Build test production build - name: Build test production build
run: yarn turbo run build:test --filter=frontend run: yarn build:test --filter=frontend
shell: bash shell: bash
env: env:
NODEJS_VERSION: ${{ env.NODEJS_VERSION }} NODEJS_VERSION: ${{ env.NODEJS_VERSION }}
@ -197,7 +197,7 @@ jobs:
run: "curl -L --max-time 120 http://127.0.0.1:3001/" run: "curl -L --max-time 120 http://127.0.0.1:3001/"
- name: Run cypress - name: Run cypress
run: yarn turbo run test:e2e:ci --filter=frontend run: yarn test:e2e:ci --filter=frontend
shell: bash shell: bash
env: env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

2
.github/workflows/frontend-netlify-deploy-main.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
run: echo "HD_BASE_URL=\"https://hedgedoc.dev/\"" >> .env.production run: echo "HD_BASE_URL=\"https://hedgedoc.dev/\"" >> .env.production
- name: Build app - name: Build app
run: yarn turbo run build --filter=frontend run: yarn build --filter=frontend
shell: bash shell: bash
working-directory: . working-directory: .
env: env:

2
.github/workflows/frontend-netlify-deploy-pr.yml vendored
View file

@ -67,7 +67,7 @@ jobs:
run: echo "HD_BASE_URL=\"${{ env.DEPLOY_URL }}\"" >> .env.production run: echo "HD_BASE_URL=\"${{ env.DEPLOY_URL }}\"" >> .env.production
- name: Build app - name: Build app
run: yarn turbo run build --filter=frontend run: yarn build --filter=frontend
shell: bash shell: bash
working-directory: . working-directory: .
env: env:

2
.github/workflows/lint.yml vendored
View file

@ -27,7 +27,7 @@ jobs:
NODEJS_VERSION: ${{ env.NODEJS_VERSION }} NODEJS_VERSION: ${{ env.NODEJS_VERSION }}
- name: Run ESLint - name: Run ESLint
run: yarn turbo run lint run: yarn lint
shell: bash shell: bash
env: env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}

4
.github/workflows/test-and-build.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
NODEJS_VERSION: ${{ matrix.node }} NODEJS_VERSION: ${{ matrix.node }}
- name: Build project - name: Build project
run: yarn turbo run build run: yarn build
shell: bash shell: bash
env: env:
NODEJS_VERSION: ${{ matrix.node }} NODEJS_VERSION: ${{ matrix.node }}
@ -43,7 +43,7 @@ jobs:
TURBO_TEAM: ${{ vars.TURBO_TEAM }} TURBO_TEAM: ${{ vars.TURBO_TEAM }}
- name: Test Project - name: Test Project
run: yarn turbo run test:ci run: yarn test:ci
shell: bash shell: bash
env: env:
NODEJS_VERSION: ${{ matrix.node }} NODEJS_VERSION: ${{ matrix.node }}

2
backend/docker/Dockerfile
View file

@ -40,7 +40,7 @@ ARG TURBO_TEAM
ARG TURBO_API ARG TURBO_API
ARG TURBO_TOKEN ARG TURBO_TOKEN
RUN yarn turbo run build --filter=backend --no-cache --no-daemon RUN yarn build --filter=backend --no-cache --no-daemon
## Stage 2b: Install only prod dependencies ## Stage 2b: Install only prod dependencies
FROM code-with-deps as prod-dependencies FROM code-with-deps as prod-dependencies

2
frontend/docker/Dockerfile
View file

@ -26,7 +26,7 @@ ARG TURBO_TEAM
ARG TURBO_API ARG TURBO_API
ARG TURBO_TOKEN ARG TURBO_TOKEN
RUN yarn turbo run build --filter=frontend --no-cache --no-daemon RUN yarn build --filter=frontend --no-cache --no-daemon
# RUNNER # RUNNER
FROM base FROM base

4
package.json
View file

@ -13,13 +13,15 @@
], ],
"scripts": { "scripts": {
"build": "dotenv -c production -- turbo run build", "build": "dotenv -c production -- turbo run build",
"build:test": "dotenv -c production -- turbo run build:test",
"lint": "dotenv -c development -- turbo run lint", "lint": "dotenv -c development -- turbo run lint",
"lint:fix": "dotenv -c development -- turbo run lint:fix", "lint:fix": "dotenv -c development -- turbo run lint:fix",
"format": "dotenv -c development -- turbo run format", "format": "dotenv -c development -- turbo run format",
"start:dev": "dotenv -c development -- turbo run start:dev", "start:dev": "dotenv -c development -- turbo run start:dev",
"start": "dotenv -c production -- turbo run start", "start": "dotenv -c production -- turbo run start",
"test:ci": "dotenv -c test -- turbo run test:ci", "test:ci": "dotenv -c test -- turbo run test:ci",
"test": "dotenv -c test -- turbo run test" "test": "dotenv -c test -- turbo run test",
"test:e2e:ci": "dotenv -c test -- turbo run test:e2e:ci"
}, },
"packageManager": "yarn@3.6.3", "packageManager": "yarn@3.6.3",
"resolutions": { "resolutions": {