Merge branch 'dev' into implementation/50832-add-a-dropdown-item-hist…

…ory-to-link-to-the-meetings-activity-page

.github/workflows/continuous-delivery.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - dev
       - release/*
+      - stable/*
 permissions:
   contents: read
 

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ on:
     inputs:
       tag:
         description: "The tag to release. Note that this happens by default on the tag push. Only run this action when something went wrong!"
-        required: true
+        required: false
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -23,7 +23,7 @@ env:
 jobs:
   build:
     if: github.repository == 'opf/openproject'
-    runs-on: [ self-hosted, aws, ubuntu22, x64, 2XL ]
+    runs-on: [ self-hosted, aws, ubuntu22, x64, L, "run-id=${{ github.run_id }}" ]
     strategy:
       matrix:
         include:
@@ -45,21 +45,31 @@ jobs:
         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"
-      - name: Checkout current release
-        if: ${{ github.event_name == 'push' }}
-        uses: actions/checkout@v3
-      - name: Checkout specific version
-        if: ${{ github.event_name != 'push' }}
+          echo "::set-output name=checkout_ref::$CHECKOUT_REF"
+      - name: Checkout
         with:
-          ref: ${{ inputs.tag }}
-        uses: actions/checkout@v3
+          ref: ${{ steps.extract_version.outputs.checkout_ref }}
+        uses: actions/checkout@v4
       - name: Prepare docker files
         run: |
           cp ./docker/prod/Dockerfile ./Dockerfile
@@ -82,6 +92,7 @@ jobs:
           images: |
             ${{ env.REGISTRY_IMAGE }}
       - name: Build image
+        id: build
         uses: docker/build-push-action@v4
         with:
           context: .
@@ -104,7 +115,7 @@ jobs:
             -e SUPERVISORD_LOG_LEVEL=debug \
             -e OPENPROJECT_LOGIN__REQUIRED=false \
             -e OPENPROJECT_HTTPS=false \
-            ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
+            ${{ steps.build.outputs.imageid }}
 
           sleep 60
 

.github/workflows/test-core.yml

@@ -23,7 +23,7 @@ jobs:
   all:
     name: Units + Features
     if: github.repository == 'opf/openproject'
-    runs-on: [self-hosted, aws, ubuntu22, x64, 2XL]
+    runs-on: runs-on,runner=32cpu-linux,family=m7i+m7a,run-id=${{ github.run_id }}
     timeout-minutes: 40
     env:
       DOCKER_BUILDKIT: 1
@@ -32,7 +32,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Cache DOCKER
       id: cache_docker
-      uses: actions/cache@v3
+      uses: runs-on/cache@v4
       with:
         path: cache/docker
         # Note: no restore keys since whenever the files below change, we want to rebuild the full image from scratch
@@ -41,28 +41,28 @@ jobs:
       if: steps.cache_docker.outputs.cache-hit == 'true'
       run: docker load -i cache/docker/image.tar
     - name: Cache GEM
-      uses: actions/cache@v3
+      uses: runs-on/cache@v4
       with:
         path: cache/bundle
         key: gem-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
           gem-
     - name: Cache NPM
-      uses: actions/cache@v3
+      uses: runs-on/cache@v4
       with:
         path: cache/node
         key: node-${{ hashFiles('package.json', 'frontend/package-lock.json') }}
         restore-keys: |
           node-
     - name: Cache ANGULAR
-      uses: actions/cache@v3
+      uses: runs-on/cache@v4
       with:
         path: cache/angular
         key: angular-${{ hashFiles('package.json', 'frontend/package-lock.json') }}
         restore-keys: |
           angular-
     - name: Cache TEST RUNTIME
-      uses: actions/cache@v3
+      uses: runs-on/cache@v4
       with:
         path: cache/runtime-logs
         key: runtime-logs-${{ github.head_ref || github.ref }}-${{ github.sha }}

.rubocop.yml

@@ -415,10 +415,9 @@ Style/SpecialGlobalVars:
 #   For the record: using single quotes does NOT have any performance advantages.
 #   Even if it did, this would be a silly argument.
 #
-# Ideally we would just use double quotes everywhere but since that would result
-# in innumerable rubocop offenses we will just disable this. Quote away.
+# Quote away.
 Style/StringLiterals:
-  Enabled: false
+  EnforcedStyle: double_quotes
 
 Style/TrivialAccessors:
   Enabled: false

Gemfile

@@ -107,7 +107,7 @@ gem 'svg-graph', '~> 2.2.0'
 
 gem 'date_validator', '~> 0.12.0'
 gem 'email_validator', '~> 2.2.3'
-gem 'json_schemer', '~> 2.1.0'
+gem 'json_schemer', '~> 2.2.0'
 gem 'ruby-duration', '~> 3.2.0'
 
 # `config/initializers/mail_starttls_patch.rb` has also been patched to
@@ -124,8 +124,7 @@ gem 'multi_json', '~> 1.15.0'
 gem 'oj', '~> 3.16.0'
 
 gem 'daemons'
-gem 'delayed_cron_job', '~> 0.9.0'
-gem 'delayed_job_active_record', '~> 4.1.5'
+gem 'good_job', '~> 3.26.1' # update should be done manually in sync with saas-openproject version.
 
 gem 'rack-protection', '~> 3.2.0'
 
@@ -384,4 +383,4 @@ end
 
 gem 'openproject-octicons', '~>19.8.0'
 gem 'openproject-octicons_helper', '~>19.8.0'
-gem 'openproject-primer_view_components', '~>0.22.2'
+gem 'openproject-primer_view_components', '~>0.23.0'