Merge branch 'main' into ingesting-update-rawpixel-image-url

Author: rawpixel-vincent

.github/workflows/ci_cd.yml

@@ -10,7 +10,14 @@ on:
       image_tag:
         description: "The tag to assign to the images built in the workflow."
         type: string
-        required: true
+        required: false
+        default: ""
+      # This is useful when dispatching on a branch other than `main`.
+      perform_deploy:
+        description: "Publish images and deploy staging?"
+        type: boolean
+        required: false
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -56,10 +63,10 @@ jobs:
       - name: Get image tag
         id: get-image-tag
         run: |
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-              echo "image_tag=${{ inputs.image_tag }}" >> "$GITHUB_OUTPUT"
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" && "${{ inputs.image_tag }}" != "" ]]; then
+              echo "image_tag=${{ inputs.image_tag }}" | tee "$GITHUB_OUTPUT"
           else
-              echo "image_tag=${{ github.sha }}" >> "$GITHUB_OUTPUT"
+              echo "image_tag=${{ github.sha }}" | tee "$GITHUB_OUTPUT"
           fi
 
   determine-images:
@@ -192,8 +199,7 @@ jobs:
       - name: Prepare build args
         id: prepare-build-args
         run: |
-          just versions
-          just versions >> "$GITHUB_OUTPUT"
+          just versions | tee "$GITHUB_OUTPUT"
 
       # ℹ️Step only applies for frontend image.
       # This step
@@ -737,8 +743,7 @@ jobs:
           $EOF
           HEREDOC
           )
-          echo "$MESSAGE"
-          echo "$MESSAGE" >> "$GITHUB_OUTPUT"
+          echo "$MESSAGE" | tee "$GITHUB_OUTPUT"
 
       - uses: peter-evans/create-or-update-comment@v3
         id: create-comment
@@ -901,8 +906,10 @@ jobs:
     # prevent running on fork PRs
     if: |
       !failure() && !cancelled() &&
-      github.event_name == 'push' &&
-      github.repository == 'WordPress/openverse' &&
+      (
+        (github.event_name == 'push' && github.repository == 'WordPress/openverse') ||
+        (github.event_name == 'workflow_dispatch' && inputs.perform_deploy)
+      ) &&
       needs.determine-images.outputs.do_publish == 'true' &&
       (needs.test-ing.result == 'success' || needs.test-ing.result == 'skipped') &&
       (needs.test-api.result == 'success' || needs.test-api.result == 'skipped') &&
@@ -960,7 +967,10 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !failure() && !cancelled() &&
-      github.event_name == 'push' &&
+      (
+        (github.event_name == 'push' && github.repository == 'WordPress/openverse') ||
+        (github.event_name == 'workflow_dispatch' && inputs.perform_deploy)
+      ) &&
       needs.get-changes.outputs.frontend == 'true' &&
       needs.playwright.result == 'success' &&
       needs.publish-images.result == 'success'
@@ -1002,7 +1012,10 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !failure() && !cancelled() &&
-      github.event_name == 'push' &&
+      (
+        (github.event_name == 'push' && github.repository == 'WordPress/openverse') ||
+        (github.event_name == 'workflow_dispatch' && inputs.perform_deploy)
+      ) &&
       needs.get-changes.outputs.api == 'true' &&
       needs.publish-images.result == 'success'
     needs:
@@ -1046,10 +1059,12 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !cancelled() &&
-      github.event_name == 'push' &&
-      github.repository == 'WordPress/openverse' &&
       (
-        (needs.get-changes.outputs.documentation == 'true' && needs.emit-docs.result != 'success') ||
+        (github.event_name == 'push' && github.repository == 'WordPress/openverse') ||
+        (github.event_name == 'workflow_dispatch' && inputs.perform_deploy)
+      ) &&
+      (
+        ((github.event_name == 'push' && needs.get-changes.outputs.documentation == 'true') && needs.emit-docs.result != 'success') ||
         (needs.determine-images.outputs.do_publish == 'true' && needs.publish-images.result != 'success') ||
         (needs.get-changes.outputs.frontend == 'true' && needs.deploy-frontend.result != 'success') ||
         (needs.get-changes.outputs.api == 'true' && needs.deploy-api.result != 'success')

.github/workflows/pr_limit_reminders.yml

@@ -11,6 +11,7 @@ jobs:
     outputs:
       pr_count: ${{ steps.count-prs.outputs.pr_count }}
       slack_id: ${{ steps.count-prs.outputs.slack_id }}
+      should_alert: ${{ steps.count-prs.outputs.should_alert }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/github-script@v6
@@ -26,7 +27,7 @@ jobs:
   send_message:
     needs: analyze-user-prs
     name: Send Slack message
-    if: ${{ needs.analyze-user-prs.outputs.pr_count >= 3 }}
+    if: needs.analyze-user-prs.outputs.pr_count >= 3
     runs-on: ubuntu-latest
     env:
       pr_count: ${{ needs.analyze-user-prs.outputs.pr_count }}

.github/workflows/pr_ping.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           payload: |
             {
-             "text": "PR by${{ env.pr_author }}in ${{ env.pr_repo }} marked ready for review: #${{ env.pr_number }} - ${{ env.pr_title }}",
+             "text": "PR by ${{ env.pr_author }} in ${{ env.pr_repo }} marked ready for review: #${{ env.pr_number }} - ${{ env.pr_title }}",
              "blocks": [
                {
                  "type": "section",

.github/workflows/push_docker_image.yml

@@ -37,7 +37,7 @@ elasticsearch = "==8.11.1"
 elasticsearch-dsl = "~=8.9"
 future = "~=0.18"
 limit = "~=0.2"
-Pillow = "~=10.1.0"
+Pillow = "~=10.2.0"
 psycopg = "~=3.1"
 python-decouple = "~=3.8"
 python-xmp-toolkit = "~=2.0"