fix lint and workflow

hpi-schul-cloud · Aug 1, 2024 · 8fb2db2 · 8fb2db2
1 parent e241175
commit 8fb2db2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -28,9 +28,6 @@ jobs:
       - branch_meta
     permissions:
       packages: write
-    strategy:
-      matrix:
-        tenants: [default, brb, n21, thr]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -39,7 +36,7 @@ jobs:
         id: docker_meta_img
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}-${{ matrix.tenants }}
+          images: ghcr.io/${{ github.repository }}
           tags: |
             type=ref,event=branch,enable=false,priority=600
             type=sha,enable=true,priority=600,prefix=
@@ -53,7 +50,7 @@ jobs:
 
       - name: test image exists
         run: |
-          echo "IMAGE_EXISTS=$(docker manifest inspect ghcr.io/${{ github.repository }}-${{ matrix.tenants }}:${{ needs.branch_meta.outputs.sha }} > /dev/null && echo 1 || echo 0)" >> $GITHUB_ENV
+          echo "IMAGE_EXISTS=$(docker manifest inspect ghcr.io/${{ github.repository }}:${{ needs.branch_meta.outputs.sha }} > /dev/null && echo 1 || echo 0)" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         if: ${{ env.IMAGE_EXISTS == 0 }}
@@ -63,14 +60,12 @@ jobs:
         if: ${{ env.IMAGE_EXISTS == 0 }}
         uses: docker/build-push-action@v5
         with:
-          build-args: |
-            SC_THEME=${{ matrix.tenants }}
           context: .
           file: ./Dockerfile
           platforms: linux/amd64
           push: true
           pull: true
-          tags: ghcr.io/${{ github.repository }}-${{ matrix.tenants }}:${{ needs.branch_meta.outputs.sha }}
+          tags: ghcr.io/${{ github.repository }}:${{ needs.branch_meta.outputs.sha }}
           labels: ${{ steps.docker_meta_img.outputs.labels }}
 
       - name: Send Notification to Rocket Chat if docker image build failed
@@ -139,7 +134,7 @@ jobs:
       - name: run trivy vulnerability scanner
         uses: aquasecurity/trivy-action@1f6384b6ceecbbc6673526f865b818a2a06b07c9
         with:
-          image-ref: "ghcr.io/${{ github.repository }}-default:${{ needs.branch_meta.outputs.sha }}"
+          image-ref: "ghcr.io/${{ github.repository }}:${{ needs.branch_meta.outputs.sha }}"
           format: "sarif"
           output: "trivy-results.sarif"
           severity: "CRITICAL,HIGH"

diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "@vue/cli-plugin-router": "~5.0.8",
     "@vue/cli-plugin-typescript": "~5.0.8",
     "@vue/cli-plugin-unit-jest": "~5.0.8",
-    "@vue/cli-service": "^5.0.8",
+    "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "^2.4.6",
     "@vue/vue3-jest": "^27.0.0",

diff --git a/src/shims-tsx.d.ts b/src/shims-tsx.d.ts
@@ -5,7 +5,7 @@ declare global {
 		interface Element extends VNode {}
 		interface ElementClass extends Vue {}
 		interface IntrinsicElements {
-			// eslint-disable-next-line no-explicit-any
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			[elem: string]: any;
 		}
 	}