Merge branch 'dev' into bug/52098-misleading-error-message-ifc-direct…

…-upload

.dockerignore

@@ -33,3 +33,6 @@ frontend/node_modules
 node_modules
 # travis
 vendor/bundle
+# allow precompiled assets to be injected
+!/public/assets
+!/config/frontend_assets.manifest.json

.git-blame-ignore-revs

@@ -3,9 +3,10 @@
 48a4f1b6adb1e847a90a61f2ab277f28bcd77608
 # Update copyright information for 2023
 21a696ef9b170e14ad2daf53364a4c2113822c2f
-# Update copyright information for 2023
+# Update copyright information for 2024
 c795874f7f281297bbd3bad2fdb58b24cb4ce624
 # switch to double quotes
+f3c99ee5dded81ad55f2b6f3706216d5fa765677
 5c72ea0046a6b5230bf456f55a296ed6fd579535
 9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c
 6678cab48d443b5782fa93b171d62093819ee4fc

.github/workflows/danger.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2.3'
+          ruby-version: '3.3.1'
       - uses: MeilCli/danger-action@v5
         with:
           danger_file: 'Dangerfile'

.github/workflows/docker.yml

@@ -3,7 +3,7 @@ name: Docker
 on:
   # build dev daily
   schedule:
-    - cron: '20 2 * * *' # Daily at 02:20
+    - cron: "20 2 * * *" # Daily at 02:20
 
   push:
     tags:
@@ -21,7 +21,7 @@ env:
   REGISTRY_IMAGE: openproject/openproject
 
 jobs:
-  extract_version:
+  setup:
     runs-on: ubuntu-latest
     steps:
       - name: Extract version
@@ -36,6 +36,11 @@ jobs:
           elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             TAG_REF=${{ inputs.tag }}
             CHECKOUT_REF=${{ inputs.tag }}
+
+            if [ -z "$TAG_REF" ]; then
+              TAG_REF=dev
+              CHECKOUT_REF=dev
+            fi
           else
             echo "Unsupported event"
             exit 1
@@ -50,75 +55,105 @@ jobs:
           echo "Version: $VERSION"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "checkout_ref=$CHECKOUT_REF" >> "$GITHUB_OUTPUT"
+      - uses: actions/checkout@v4
+      - name: Cache NPM
+        uses: runs-on/cache@v4
+        with:
+          path: |
+            frontend/node_modules
+            node_modules
+          key: nodejs-x64-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: nodejs-x64-
+      - name: Cache angular
+        uses: runs-on/cache@v4
+        with:
+          path: frontend/.angular
+          key: angular-${{ github.ref }}
+          restore-keys: angular-
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            frontend/package-lock.json
+      - name: Precompile assets
+        run: |
+          ./docker/prod/setup/precompile-assets.sh
+          cp config/frontend_assets.manifest.json public/assets/frontend_assets.manifest.json
+      - uses: actions/upload-artifact@v3
+        with:
+          path: public/
+          name: public-assets-${{ github.sha }}
     outputs:
       version: ${{ steps.extract_version.outputs.version }}
       checkout_ref: ${{ steps.extract_version.outputs.checkout_ref }}
   build:
     needs:
-      - extract_version
+      - setup
     if: github.repository == 'opf/openproject'
-    runs-on: runs-on,runner=8cpu-linux,family=m7i+m7a,run-id=${{ github.run_id }}
+    runs-on:
+      labels:
+        - runs-on
+        - ssh=false
+        - run-id=${{ github.run_id }}
+        - ${{ matrix.runner }}
     strategy:
       matrix:
         include:
           - platform: linux/amd64
+            bim_support: true
             target: slim
+            runner: runner=4cpu-linux-x64
           - platform: linux/arm64/v8
+            bim_support: false
             target: slim
+            runner: runner=4cpu-linux-arm64
           - platform: linux/amd64
+            bim_support: true
             target: all-in-one
-          - platform: linux/ppc64le
+            runner: runner=4cpu-linux-x64
+          - platform: linux/arm64/v8
             bim_support: false
             target: all-in-one
-          - platform: linux/arm64/v8
+            runner: runner=4cpu-linux-arm64
+          - platform: linux/ppc64le
             bim_support: false
             target: all-in-one
+            runner: runner=4cpu-linux-x64
     steps:
-      - name: Extract version
-        id: extract_version
-        run: |
-          if [[ ${{ github.event_name }} == 'push' ]]; then
-            TAG_REF=${GITHUB_REF#refs/tags/}
-            CHECKOUT_REF=$GITHUB_REF
-          elif [[ ${{ github.event_name }} == 'schedule' ]]; then
-            TAG_REF=dev
-            CHECKOUT_REF=refs/heads/dev
-          elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
-            TAG_REF=${{ inputs.tag }}
-            CHECKOUT_REF=${{ inputs.tag }}
-          else
-            echo "Unsupported event"
-            exit 1
-          fi
-          
-          if [ -z "$TAG_REF" ] || [ -z "$CHECKOUT_REF" ]; then
-            echo "No TAG_REF or CHECKOUT_REF set. Aborting"
-            exit 1
-          fi
-
-          VERSION=${TAG_REF#v}
-          echo "Version: $VERSION"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=checkout_ref::$CHECKOUT_REF"
       - name: Checkout
         with:
-          ref: ${{ steps.extract_version.outputs.checkout_ref }}
+          ref: ${{ needs.setup.outputs.checkout_ref }}
         uses: actions/checkout@v4
       - name: Prepare docker files
         run: |
           cp ./docker/prod/Dockerfile ./Dockerfile
-
-          # Add build information
-          echo "${{ steps.extract_version.outputs.checkout_ref }}" > PRODUCT_VERSION
-          echo "https://github.com/opf/openproject/commits/${{ steps.extract_version.outputs.checkout_ref }}" > PRODUCT_URL
+      - name: Download precompiled public assets
+        uses: actions/download-artifact@v3
+        with:
+          name: public-assets-${{ github.sha }}
+          path: public/
+      - name: Setup precompiled assets
+        run: |
+          ls -al public/
+          mv public/assets/frontend_assets.manifest.json config/frontend_assets.manifest.json
+          ls -al config/frontend_assets.manifest.json
+      - name: Add build information
+        run: |
+          echo "${{ needs.setup.outputs.checkout_ref }}" > PRODUCT_VERSION
+          echo "https://github.com/opf/openproject/commits/${{ needs.setup.outputs.checkout_ref }}" > PRODUCT_URL
           date -u +"%Y-%m-%dT%H:%M:%SZ" > RELEASE_DATE
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -132,7 +167,7 @@ jobs:
             org.opencontainers.image.documentation=https://www.openproject.org/docs/
             org.opencontainers.image.vendor=OpenProject GmbH
           tags: |
-            type=semver,pattern={{version}},value=${{ needs.extract_version.outputs.version }}
+            type=semver,pattern={{version}},value=${{ needs.setup.outputs.version }}
           images: |
             ${{ env.REGISTRY_IMAGE }}
       - name: Build image
@@ -148,6 +183,8 @@ jobs:
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
+          cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
       - name: Test
         # We only test the native container. If that fails the builds for the others
         # will be cancelled as well.
@@ -176,6 +213,8 @@ jobs:
             BIM_SUPPORT=${{ matrix.bim_support }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
+          cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
       - name: Export digest
         run: |
           mkdir -p /tmp/digests
@@ -194,7 +233,7 @@ jobs:
       matrix:
         target: [slim, all-in-one]
     needs:
-      - extract_version
+      - setup
       - build
     steps:
       - name: Download digests
@@ -209,7 +248,7 @@ jobs:
           if [ "$suffix" = "-all-in-one" ]; then suffix="" ; fi
           echo "suffix=$suffix" >> "$GITHUB_OUTPUT"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -223,12 +262,12 @@ jobs:
             latest=false
             suffix=${{ steps.set_suffix.outputs.suffix }}
           tags: |
-            type=semver,pattern={{version}},value=${{ needs.extract_version.outputs.version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ needs.extract_version.outputs.version }}
-            type=semver,pattern={{major}},value=${{ needs.extract_version.outputs.version }}
+            type=semver,pattern={{version}},value=${{ needs.setup.outputs.version }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ needs.setup.outputs.version }}
+            type=semver,pattern={{major}},value=${{ needs.setup.outputs.version }}
             type=raw,value=dev,priority=200,enable={{is_default_branch}}
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -240,3 +279,11 @@ jobs:
       - name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+  notify:
+    needs: [setup, build, merge]
+    if: ${{ always() && contains(needs.*.result, 'failure') }}
+    uses: ./.github/workflows/email-notification.yml
+    secrets: inherit
+    with:
+      subject: "Docker build failed"
+      body: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/email-notification.yml

@@ -0,0 +1,38 @@
+name: email-notification
+
+on:
+  workflow_call:
+    inputs:
+      subject:
+        type: string
+        required: true
+      body:
+        type: string
+        required: true
+      from:
+        type: string
+        default: Github CI <github-ci@openproject.com>
+      to:
+        type: string
+        default: operations@openproject.com
+    secrets:
+      OPS_MAIL_SMTP_TOKEN:
+        required: true
+
+jobs:
+  notify:
+    name: Notify
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send mail
+        uses: dawidd6/action-send-mail@v3
+        with:
+          subject: ${{ inputs.subject }}
+          body: ${{ inputs.body }}
+          from: ${{ inputs.from }}
+          to: ${{ inputs.to }}
+          secure: false
+          server_port: 587
+          server_address: smtp.postmarkapp.com
+          username: PM-T-outbound-bw6Xf6uoKnU76g1RcuydgZ
+          password: ${{secrets.OPS_MAIL_SMTP_TOKEN }}

.github/workflows/test-core.yml

@@ -44,9 +44,9 @@ jobs:
       uses: runs-on/cache@v4
       with:
         path: cache/bundle
-        key: gem-${{ hashFiles('Gemfile.lock') }}
+        key: gem-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
-          gem-
+          gem-${{ hashFiles('.ruby-version') }}-
     - name: Cache NPM
       uses: runs-on/cache@v4
       with:

.rubocop.yml

@@ -22,7 +22,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
   # Enable any new cops in new versions by default
   NewCops: enable
   Exclude:

.ruby-version

@@ -1 +1 @@
-3.2.3
+3.3.1