Browse Source

chore(github-action): cypress docker file path correction

pull/700/head
Pranav C 3 years ago
parent
commit
0652fda711
  1. 4
      .github/workflows/ci-cd.yml
  2. 2
      packages/nc-gui/nuxt.config.js

4
.github/workflows/ci-cd.yml

@ -40,7 +40,7 @@ jobs:
start: | start: |
npm run start:api npm run start:api
npm run start:web npm run start:web
docker-compose -f ./docker-compose-cypress.yml up -d docker-compose -f ./scripts/docker-compose-cypress.yml up -d
spec: 'cypress/integration/test/masterSuiteRest.js' spec: 'cypress/integration/test/masterSuiteRest.js'
wait-on: 'http://localhost:8080, http://localhost:3000/_nuxt/runtime.js' wait-on: 'http://localhost:8080, http://localhost:3000/_nuxt/runtime.js'
wait-on-timeout: 1200 wait-on-timeout: 1200
@ -74,7 +74,7 @@ jobs:
start: | start: |
npm run start:api npm run start:api
npm run start:web npm run start:web
docker-compose -f ./docker-compose-cypress.yml up -d docker-compose -f ./scripts/docker-compose-cypress.yml up -d
spec: 'cypress/integration/test/masterSuiteGql.js' spec: 'cypress/integration/test/masterSuiteGql.js'
wait-on: 'http://localhost:8080, http://localhost:3000/_nuxt/runtime.js' wait-on: 'http://localhost:8080, http://localhost:3000/_nuxt/runtime.js'
wait-on-timeout: 1200 wait-on-timeout: 1200

2
packages/nc-gui/nuxt.config.js

@ -112,7 +112,7 @@ export default {
** See https://nuxtjs.org/api/configuration-build/ ** See https://nuxtjs.org/api/configuration-build/
*/ */
build: { build: {
cache: true, parallel: true,
plugins: [ plugins: [
new MonacoEditorWebpackPlugin({ new MonacoEditorWebpackPlugin({
// https://github.com/Microsoft/monaco-editor-webpack-plugin#options // https://github.com/Microsoft/monaco-editor-webpack-plugin#options

Loading…
Cancel
Save