Merge pull request #968 from geonetwork/ME/revert-dump

[ME]: Revert dump
geonetwork · Aug 26, 2024 · b0bcda8 · b0bcda8
2 parents dd042ce + 58890f5
commit b0bcda8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -139,12 +139,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   e2e-run:
-    name: End-to-end tests, GeoNetwork v${{ matrix.gn_version }}
+    name: E2E tests / ${{ matrix.app }} / GN v${{ matrix.gn_version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         gn_version: [4.2.2, 4.2.8, 4.4.0]
+        app: [datahub, metadata-editor]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -172,14 +173,16 @@ jobs:
 
       - run: npm ci
 
-      - name: Run e2e tests
-        run: npx nx affected --target=e2e
+      - name: Run e2e tests for ${{ matrix.app }}
+        env:
+          APP: ${{ matrix.app }}
+        run: npx nx e2e "$APP-e2e"
 
       - uses: actions/upload-artifact@v4
         if: always()
         id: upload-screenshots
         with:
-          name: cypress-screenshots-gn-${{ matrix.gn_version }}
+          name: cypress-screenshots-app-${{ matrix.app }}-gn-${{ matrix.gn_version }}
           path: |
             apps/datahub-e2e/cypress/screenshots/**/*
             apps/metadata-editor-e2e/cypress/screenshots/**/*

diff --git a/apps/datahub-e2e/project.json b/apps/datahub-e2e/project.json
@@ -33,5 +33,5 @@
     }
   },
   "tags": [],
-  "implicitDependencies": ["datahub"]
+  "implicitDependencies": ["datahub", "database-dump"]
 }
diff --git a/apps/metadata-editor-e2e/project.json b/apps/metadata-editor-e2e/project.json
@@ -13,12 +13,6 @@
         "browser": "chrome",
         "port": "cypress-auto"
       },
-      "dependsOn": [
-        {
-          "projects": ["datahub-e2e"],
-          "target": "e2e"
-        }
-      ],
       "configurations": {
         "production": {
           "devServerTarget": "metadata-editor:serve:production"
@@ -39,5 +33,5 @@
     }
   },
   "tags": [],
-  "implicitDependencies": ["metadata-editor"]
+  "implicitDependencies": ["metadata-editor", "database-dump"]
 }
diff --git a/support-services/docker-entrypoint-initdb.d/dump b/support-services/docker-entrypoint-initdb.d/dump
diff --git a/support-services/docker-entrypoint-initdb.d/project.json b/support-services/docker-entrypoint-initdb.d/project.json
@@ -0,0 +1,9 @@
+{
+  "name": "database-dump",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "support-services/docker-entrypoint-initdb.d",
+  "prefix": "gn-ui",
+  "targets": {},
+  "tags": ["scope:support-services"]
+}