Merge branch 'refs/heads/main' into js/refactor-board-remove-intersec…

…tion-observer # Conflicts: # src/components/Board/__tests__/Board.test.tsx
inovex · Jul 24, 2024 · 59252d9 · 59252d9
2 parents ea38296 + 6867d80
commit 59252d9
Show file tree

Hide file tree

Showing 49 changed files with 1,131 additions and 895 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -5,36 +5,50 @@ on:
     outputs:
       frontend-image-tag:
         description: The tag of the frontend image
-        value: ${{ jobs.package.outputs.frontend-image-tag }}
+        value: ${{ jobs.package-frontend.outputs.frontend-image-tag }}
       server-image-tag:
         description: The tag of the server image
-        value: ${{ jobs.package.outputs.server-image-tag }}
-
-
+        value: ${{ jobs.package-server.outputs.server-image-tag }}
 
 jobs:
-  package:
+  determine-platforms:
+    runs-on: ubuntu-latest
+    outputs:
+      platforms: ${{ steps.platforms.outputs.platforms }}
+    steps:
+      - name: Set platforms
+        id: platforms
+        run: |
+          if [ "${{ github.event_name }}" == "release" ]; then
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+          else
+            echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
+          fi
+  package-frontend:
+    needs: determine-platforms
     outputs:
       frontend-image-tag: ${{ steps.outputs.outputs.frontend-image-tag }}
-      server-image-tag: ${{ steps.outputs.outputs.server-image-tag }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to GitHub container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: scrumlr.io - Frontend image meta information
         id: meta-frontend
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/inovex/scrumlr.io/scrumlr-frontend
@@ -53,9 +67,50 @@ jobs:
             org.opencontainers.image.title=scrumlr.io Frontend
             org.opencontainers.image.description=The web client for scrumlr.io
 
+      - name: Build and push frontend images
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ needs.determine-platforms.outputs.platforms }}
+          push: true
+          tags: ${{ steps.meta-frontend.outputs.tags }}
+          labels: ${{ steps.meta-frontend.outputs.labels }}
+          cache-from: type=registry,ref=ghcr.io/inovex/scrumlr.io/scrumlr-frontend:cache
+          cache-to: type=registry,ref=ghcr.io/inovex/scrumlr.io/scrumlr-frontend:cache,mode=max
+
+      - name: Set outputs
+        id: outputs
+        run: |
+          echo $DOCKER_METADATA_OUTPUT_TAGS
+          echo _____________________________________________________
+          echo frontend-image-tag=$(echo "$(echo $DOCKER_METADATA_OUTPUT_TAGS | grep -oP 'sha-[a-f0-9]+')" ) >> $GITHUB_OUTPUT
+
+  package-server:
+    needs: determine-platforms
+    outputs:
+      server-image-tag: ${{ steps.outputs.outputs.server-image-tag }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: scrumlr.io - Server image meta information
         id: meta-server
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/inovex/scrumlr.io/scrumlr-server
@@ -74,31 +129,21 @@ jobs:
             org.opencontainers.image.title=scrumlr.io Server
             org.opencontainers.image.description=The server for scrumlr.io
 
-      - name: Set up Docker buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Push frontend image
-        id: push-frontend
-        uses: docker/build-push-action@v4
-
-        with:
-          push: true
-          tags: ${{ steps.meta-frontend.outputs.tags }}
-          labels: ${{ steps.meta-frontend.outputs.labels }}
-
-      - name: Push server image
-        id: push-server
+      - name: Build and push server images
         uses: docker/build-push-action@v4
         with:
           context: ./server/src
+          file: ./server/src/Dockerfile
+          platforms: ${{ needs.determine-platforms.outputs.platforms }}
           push: true
           tags: ${{ steps.meta-server.outputs.tags }}
           labels: ${{ steps.meta-server.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Set outputs
         id: outputs
         run: |
           echo $DOCKER_METADATA_OUTPUT_TAGS
-          echo __________________________________________________________________
-          echo frontend-image-tag=$(echo "$(echo $DOCKER_METADATA_OUTPUT_TAGS | grep -oP 'sha-[a-f0-9]+')") >> $GITHUB_OUTPUT
-          echo server-image-tag=$(echo "$(echo $DOCKER_METADATA_OUTPUT_TAGS | grep -oP 'sha-[a-f0-9]+')") >> $GITHUB_OUTPUT
+          echo _____________________________________________________
+          echo server-image-tag=$(echo "$(echo $DOCKER_METADATA_OUTPUT_TAGS | grep -oP 'sha-[a-f0-9]+')" ) >> $GITHUB_OUTPUT
diff --git a/package.json b/package.json
@@ -16,20 +16,20 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@fontsource/raleway": "^5.0.19",
     "@react-hook/resize-observer": "^2.0.1",
-    "@react-spring/web": "^9.7.3",
+    "@react-spring/web": "^9.7.4",
     "@reduxjs/toolkit": "^1.9.7",
     "avataaars": "^2.0.0",
     "classnames": "^2.5.1",
     "file-saver": "^2.0.5",
-    "i18next": "^23.12.1",
+    "i18next": "^23.12.2",
     "i18next-browser-languagedetector": "^8.0.0",
     "js-cookie": "^3.0.5",
     "linkify-react": "^4.1.3",
     "linkifyjs": "^4.1.3",
     "marked": "13.0.2",
     "plausible-tracker": "^0.3.9",
     "qrcode.react": "^3.1.0",
-    "query-string": "^9.0.0",
+    "query-string": "^9.1.0",
     "react": "^18.3.1",
     "react-autosize-textarea": "^7.1.0",
     "react-dom": "^18.3.1",
@@ -49,8 +49,8 @@
     "use-sound": "^4.0.3"
   },
   "devDependencies": {
-    "@testing-library/dom": "^10.3.2",
-    "@testing-library/jest-dom": "^6.4.6",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/jest-dom": "^6.4.8",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/classnames": "^2.3.1",
@@ -59,7 +59,7 @@
     "@types/i18next-fs-backend": "^1.1.5",
     "@types/jest": "^29.5.12",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.14.11",
+    "@types/node": "^20.14.12",
     "@types/qrcode.react": "^1.0.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
@@ -83,7 +83,7 @@
     "eslint-plugin-jsx-a11y": "6.9.0",
     "eslint-plugin-only-warn": "^1.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "7.34.4",
+    "eslint-plugin-react": "7.35.0",
     "eslint-plugin-react-hooks": "4.6.2",
     "hash-files": "^1.1.1",
     "husky": "^9.1.1",