Merge 'dev' into branch

it-at-m · Sep 5, 2023 · f7c945a · f7c945a
2 parents b4bed13 + 84721dc
commit f7c945a
Show file tree

Hide file tree

Showing 3 changed files with 8,552 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,6 +3,60 @@ name: build and test
 on: [push]
 
 jobs:
+  build-test-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+          cache: "npm"
+          cache-dependency-path: "./frontend/package-lock.json"
+      - name: Execute npm install, test, build
+        working-directory: frontend
+        run: |
+          npm ci
+          npm run build --if-present
+          npm run test:unit
+      - name: Check with eslint
+        run: |
+          npm install
+          npm run check
+      - name: Archive npm artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: npm-artifacts
+          path: |
+            frontend/dist
+          retention-days: 10
+
+  build-test-java:
+    runs-on: ubuntu-latest
+    needs: build-test-npm
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download npm articats
+        uses: actions/download-artifact@v3
+        with:
+          name: npm-artifacts
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: "11"
+          distribution: "temurin"
+          cache: maven
+
+      - name: Build with Maven
+        # TODO: Tests vom API Gateway funktionieren nur mit dem SSO. Muss noch konfiguriert werden.
+        run: mvn -B -Pgitlab-cicd verify -DskipTests -Dspring.security.logging.requests=all --file pom.xml
+  #        run: mvn -B -s ./.m2/settings.xml -Pgitlab-cicd verify -Dspring.security.logging.requests=all --file pom.xml
+
   compliance:
     runs-on: ubuntu-latest
 

diff --git a/.gitignore b/.gitignore
@@ -31,16 +31,16 @@ nbdist/
 
 /node_modules/
 /build.cmd
-package-lock.json
 
 # Sonstiges
 $(pwd)
+package-lock.json
 
 # do not check in application profile yml
 apigateway/**/application-*.yml
+!apigateway/**/application-test.yml
 apigateway/**/logback-spring.xml
 frontend/.env.development
 frontend/.env.production
-frontend/package-lock.json
 frontend/auto-imports.d.ts
-frontend/components.d.ts
+frontend/components.d.ts