Merge branch 'main' of github.com:SchweizerischeBundesbahnen/DAS into…

… release-please
SchweizerischeBundesbahnen · Mar 4, 2024 · e7a0851 · e7a0851
2 parents 05481ad + b3f8665
commit e7a0851
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/ci-webapp.yml b/.github/workflows/ci-webapp.yml
@@ -25,10 +25,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: 'webapp/.nvmrc'
           cache: 'npm'
+          cache-dependency-path: 'webapp/package-lock.json'
       - run: npm clean-install
       - run: npm run lint
 
@@ -37,10 +40,13 @@ jobs:
     needs: lint
     steps:
       - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: 'webapp/.nvmrc'
           cache: 'npm'
+          cache-dependency-path: 'webapp/package-lock.json'
       - run: npm clean-install
       - run: npm test
 
@@ -49,10 +55,13 @@ jobs:
     needs: lint
     steps:
       - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
       - uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: 'webapp/.nvmrc'
           cache: 'npm'
+          cache-dependency-path: 'webapp/package-lock.json'
       - run: npm clean-install
       - run: npm run build
       - name: Store build artifacts

diff --git a/webapp/angular.json b/webapp/angular.json
@@ -96,14 +96,13 @@
           },
           "configurations": {
             "ci": {
-              "browsers": "ChromiumHeadlessCI",
+              "browsers": "ChromeHeadless",
               "codeCoverage": true,
               "sourceMap": true,
               "progress": false,
               "watch": false,
               "reporters": [
-                "dots",
-                "sonarqube"
+                "dots"
               ]
             }
           }

diff --git a/webapp/package.json b/webapp/package.json
@@ -6,7 +6,7 @@
     "start": "ng serve",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
-    "test": "ng test",
+    "test": "ng test -c ci",
     "lint": "ng lint",
     "format": "prettier --write ."
   },

diff --git a/webapp/src/index.html b/webapp/src/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>Webapp</title>
+    <p>Hallo DAS</p>
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />