deploy hotfix

Arquisoft · Apr 8, 2024 · 14493af · 14493af
1 parent 4876433
commit 14493af
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,30 +25,29 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-  # e2e-tests:
-  #   needs: [unit-tests]
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - uses: actions/setup-node@v4
-  #     with:
-  #       node-version: 20
-  #   - run: npm --prefix users/authservice install
-  #   - run: npm --prefix users/userservice install
-  #   - run: npm --prefix gatewayservice install
-  #   - run: npm --prefix webapp install
-  #   - run: npm --prefix webapp run build
-  #   - run: npm --prefix webapp run test:e2e
-  #     env:
-  #       CI: ""
+  e2e-tests:
+    needs: [unit-tests]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+    - run: npm --prefix users/authservice install
+    - run: npm --prefix users/userservice install
+    - run: npm --prefix gatewayservice install
+    - run: npm --prefix webapp install
+    - run: npm --prefix webapp run build
+    - run: npm --prefix webapp run test:e2e
+
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages
     runs-on: ARM64
     permissions:
       contents: read
       packages: write
-    # needs: [e2e-tests]
-    needs: [unit-tests]
+    needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -68,8 +67,8 @@ jobs:
             permissions:
               contents: read
               packages: write
-            # needs: [e2e-tests]
-            needs: [unit-tests]
+            needs: [e2e-tests]
+            # needs: [unit-tests]
             steps:
             - uses: actions/checkout@v4
             - name: Publish to Registry
@@ -86,8 +85,8 @@ jobs:
     permissions:
       contents: read
       packages: write
-    # needs: [e2e-tests]
-    needs: [unit-tests]
+    needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -104,8 +103,8 @@ jobs:
     permissions:
       contents: read
       packages: write
-    # needs: [e2e-tests]
-    needs: [unit-tests]
+    needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry
@@ -122,8 +121,8 @@ jobs:
     permissions:
       contents: read
       packages: write
-    # needs: [e2e-tests]
-    needs: [unit-tests]
+    needs: [e2e-tests]
+    # needs: [unit-tests]
     steps:
     - uses: actions/checkout@v4
     - name: Publish to Registry

diff --git a/webapp/package.json b/webapp/package.json
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "CI=false && react-scripts build",
     "prod": "serve -s build",
     "test": "react-scripts test --transformIgnorePatterns 'node_modules/(?!axios)/'",
     "test:e2e": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod 3000 \"cd e2e && jest\"",