Merge pull request #15058 from opf/revert-accidental-dev-merge

Revert "Merge branch 'dev' into release/13.4"

.git-blame-ignore-revs

@@ -5,6 +5,3 @@
 21a696ef9b170e14ad2daf53364a4c2113822c2f
 # Update copyright information for 2023
 c795874f7f281297bbd3bad2fdb58b24cb4ce624
-# switch to double quotes
-5c72ea0046a6b5230bf456f55a296ed6fd579535
-9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c

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

.rubocop.yml

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