diff --git a/.github/workflows/test_admin_interface.yml b/.github/workflows/test_admin_interface.yml index f5781de50..7108bd0b1 100644 --- a/.github/workflows/test_admin_interface.yml +++ b/.github/workflows/test_admin_interface.yml @@ -61,13 +61,6 @@ jobs: - name: install dependencies run: cd out && yarn install --frozen-lockfile --production=false - - name: upload out - uses: actions/upload-artifact@v4 - with: - name: out - path: out - compression-level: 2 - - name: Admin Interface | Unit tests id: test run: | @@ -75,27 +68,16 @@ jobs: echo "success=$([ $? -eq 0 ] && echo true || echo false)" >> $GITHUB_OUTPUT lint: - if: needs.files-changed.outputs.admin == 'true' name: Lint - Admin Interface - needs: [files-changed, unit_test] + needs: unit_test runs-on: ubuntu-latest steps: - - name: download out - uses: actions/download-artifact@v4 - with: - name: out - path: out - - - name: run lint - run: cd out && yarn lint - - #- name: Check result from previous step - # run: if [ "${{ needs.unit_test.outputs.test-success }}" != "true" ]; then exit 1; fi + - name: Check result from previous step + run: if [ "${{ needs.unit_test.outputs.test-success }}" != "true" ]; then exit 1; fi stylelint: - if: needs.files-changed.outputs.admin == 'true' name: Stylelint - Admin Interface - needs: [files-changed, unit_test] + needs: unit_test runs-on: ubuntu-latest steps: - name: Checkout code @@ -105,7 +87,9 @@ jobs: run: if [ "${{ needs.unit_test.outputs.test-success }}" != "true" ]; then exit 1; fi locales: + if: needs.files-changed.outputs.admin == 'true' name: Locales - Admin Interface + needs: files-changed runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index a0d442c5a..c792f9a0b 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -48,7 +48,7 @@ jobs: chmod +x /opt/cucumber-json-formatter sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter cd e2e-tests/ - bun install + bun install --production - name: wait for frontend and backend to be ready run: | diff --git a/e2e-tests/package.json b/e2e-tests/package.json index e2ecbb4f9..0cd40035a 100644 --- a/e2e-tests/package.json +++ b/e2e-tests/package.json @@ -29,9 +29,14 @@ "dependencies": { "@badeball/cypress-cucumber-preprocessor": "^18.0.1", "@cypress/browserify-preprocessor": "^3.0.2", + "cypress": "^12.16.0", + "jwt-decode": "^3.1.2", + "multiple-cucumber-html-reporter": "^3.4.0", + "typescript": "^4.7.4" + }, + "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.38.0", "@typescript-eslint/parser": "^5.38.0", - "cypress": "^12.16.0", "eslint": "^8.23.1", "eslint-config-prettier": "^8.3.0", "eslint-config-standard": "^16.0.3", @@ -41,9 +46,6 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-promise": "^6.1.1", - "jwt-decode": "^3.1.2", - "multiple-cucumber-html-reporter": "^3.4.0", - "prettier": "^2.7.1", - "typescript": "^4.7.4" + "prettier": "^2.7.1" } }