diff --git a/.github/workflows/CICD.yaml b/.github/workflows/CICD.yaml index 97e21d0..3ae3273 100644 --- a/.github/workflows/CICD.yaml +++ b/.github/workflows/CICD.yaml @@ -27,7 +27,7 @@ jobs: if: needs.semantic.outputs.new_release == 'true' strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-20.04, windows-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -45,6 +45,7 @@ jobs: cat package.json rm -rf node_modules package-lock.json npm install + npm run build_microservices npm run package shell: bash env: diff --git a/.gitignore b/.gitignore index 1fd6f8a..ab5b5cc 100644 --- a/.gitignore +++ b/.gitignore @@ -27,10 +27,10 @@ logs # Other /build /dist-electron -/electron-server/dist_back -/electron-server/dist_viewer -/electron-server/venv_back -/electron-server/venv_viewer +/electron-server/back/dist +/electron-server/viewer/dist +/electron-server/back/venv +/electron-server/viewer/venv /release /uploads vease-back* diff --git a/components/ImportFile.vue b/components/ImportFile.vue index 1f78feb..5587def 100644 --- a/components/ImportFile.vue +++ b/components/ImportFile.vue @@ -5,7 +5,7 @@ - Cancel + Cancel