Merge release/6.1.0 into trunk

Author: ricardo

.github/CODEOWNERS

@@ -0,0 +1,6 @@
+# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# Each line is a file pattern followed by one or more owners.
+
+# Harmony owns any files in the .github directory at the root of the repository and any of its subdirectories.
+/.github/ @Automattic/harmony

.github/actions/commit-push-as-bot/action.yml

@@ -0,0 +1,27 @@
+name: "Commit and push as the github-actions bot"
+description: "Commit and push as the github-actions bot"
+    
+inputs:
+  release-version:
+    description: "The release version to be used in the commit message"
+    required: true
+  branch:
+    description: "The branch where the commit will be pushed"
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: "Commit and push changes"
+      id: build_plugin
+      shell: bash
+      env:
+        RELEASE_VERSION: ${{ inputs.release-version }}
+        BRANCH_NAME: ${{ inputs.branch }}
+      run: |
+        git config user.name "github-actions[bot]"
+        # We could consider fetching the bot's ID through an API call to be future-proof. Hardcoded for now.
+        # See https://github.com/Automattic/woocommerce-payments/pull/5200#discussion_r1034560144
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git commit -am "Update version and add changelog entries for release $RELEASE_VERSION"
+        git push --set-upstream origin $BRANCH_NAME

.github/actions/process-changelog/action.yml

@@ -22,47 +22,77 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: "Process changelog for changelog.txt"
-      id: process_changelog
+    - name: "Verify the action type"
+      id: verify_action_type
+      if: ${{ inputs.action-type == 'generate' }}
       shell: bash
       env:
-        ACTION_TYPE: ${{ inputs.action-type }}
         RELEASE_VERSION: ${{ inputs.release-version }}
         RELEASE_DATE: ${{ inputs.release-date }}
+        ACTION_TYPE: ${{ inputs.action-type }}
       run: |
-        # Install this dev package globally to gather changelog entries while not including it into the release package
-        composer global require automattic/jetpack-changelogger:^3.0.7
+        FINAL_RELEASE_VERSION=$(echo "$RELEASE_VERSION" | grep -Po '\d.\d.\d(.*?)') # Keep only x.y.z from x.y.z(-test-n)
+        CURRENT_RELEASE_VERSION=$(jq '.version' package.json -r)
         
-        if ${{ env.ACTION_TYPE == 'generate' }}; then
-          CHANGELOG_FLAG=""
-          echo "Generating the changelog entries." >> $GITHUB_STEP_SUMMARY
+        # If the changelog directory is empty (except .gitkeep) and the final release version is already defined in package.json, we need to switch to amend
+        # This use case is mainly for the last test package created from the release branch, to avoid an empty changelog
+        if [ "$(ls -A changelog | wc -l)" -eq 1 ] && [[ "$FINAL_RELEASE_VERSION" == "$CURRENT_RELEASE_VERSION" ]]; then
+          echo "ACTION_TYPE=amend-version" >> $GITHUB_OUTPUT
+          echo "CURRENT_VERSION=$CURRENT_RELEASE_VERSION" >> $GITHUB_OUTPUT
         else
-          CHANGELOG_FLAG="--amend"
-          echo "Amending the changelog entries." >> $GITHUB_STEP_SUMMARY
+          echo "ACTION_TYPE=$ACTION_TYPE" >> $GITHUB_OUTPUT
         fi
+
+    - name: "Process changelog for changelog.txt"
+      id: process_changelog
+      shell: bash
+      env:
+        ACTION_TYPE: ${{ steps.verify_action_type.outputs.ACTION_TYPE }}
+        CURRENT_VERSION: ${{ steps.verify_action_type.outputs.CURRENT_VERSION }}
+        RELEASE_VERSION: ${{ inputs.release-version }}
+        RELEASE_DATE: ${{ inputs.release-date }}
+      run: |
+        if ${{ env.ACTION_TYPE == 'amend-version' }}; then
+          sed -i "s/^= $CURRENT_VERSION - .* =$/= $RELEASE_VERSION - $RELEASE_DATE =/" changelog.txt
+        else
+          # Install this dev package globally to gather changelog entries while not including it into the release package
+          composer global require automattic/jetpack-changelogger:^3.0.7
         
-        ~/.composer/vendor/bin/changelogger write --use-version="$RELEASE_VERSION" --release-date="$RELEASE_DATE" $CHANGELOG_FLAG --no-interaction --yes
+          if ${{ env.ACTION_TYPE == 'generate' }}; then
+            CHANGELOG_FLAG=""
+            echo "Generating the changelog entries." >> $GITHUB_STEP_SUMMARY
+          else
+            CHANGELOG_FLAG="--amend"
+            echo "Amending the changelog entries." >> $GITHUB_STEP_SUMMARY
+          fi
+        
+          ~/.composer/vendor/bin/changelogger write --use-version="$RELEASE_VERSION" --release-date="$RELEASE_DATE" $CHANGELOG_FLAG --no-interaction --yes
+        fi
         
-        echo "Picking up changelog for version '$RELEASE_VERSION'..."
         CHANGELOG=$(awk '/^= / { if (p) { exit }; p=1; next } p && NF' changelog.txt)
-        echo "$CHANGELOG"
         
         # Escape backslash, new line and ampersand characters. The order is important.
         CHANGELOG=${CHANGELOG//\\/\\\\}
         CHANGELOG=${CHANGELOG//$'\n'/\\n} 
         CHANGELOG=${CHANGELOG//&/\\&}
+        
         echo "CHANGELOG=$CHANGELOG" >> $GITHUB_OUTPUT
 
     - name: "Process changelog for readme.txt"
       shell: bash
       env:
-        ACTION_TYPE: ${{ inputs.action-type }}
+        ACTION_TYPE: ${{ steps.verify_action_type.outputs.ACTION_TYPE }}
+        CURRENT_VERSION: ${{ steps.verify_action_type.outputs.CURRENT_VERSION }}
         RELEASE_VERSION: ${{ inputs.release-version }}
         RELEASE_DATE: ${{ inputs.release-date }}
         CHANGELOG: ${{ steps.process_changelog.outputs.CHANGELOG }}
       run: |
-        if ${{ env.ACTION_TYPE == 'amend' }}; then
-          perl -i -p0e "s/= $RELEASE_VERSION.*?(\n){2}//s" readme.txt # Delete the existing changelog for the release version first
-        fi
+        if ${{ env.ACTION_TYPE == 'amend-version' }}; then
+          sed -i "s/^= $CURRENT_VERSION - .* =$/= $RELEASE_VERSION - $RELEASE_DATE =/" readme.txt
+        else
+          if ${{ env.ACTION_TYPE == 'amend' }}; then
+            perl -i -p0e "s/= $RELEASE_VERSION.*?(\n){2}//s" readme.txt # Delete the existing changelog for the release version first
+          fi
         
-        sed -ri "s|(== Changelog ==)|\1\n\n= $RELEASE_VERSION - $RELEASE_DATE =\n$CHANGELOG|" readme.txt
+          sed -ri "s|(== Changelog ==)|\1\n\n= $RELEASE_VERSION - $RELEASE_DATE =\n$CHANGELOG|" readme.txt
+        fi

.github/workflows/compatibility.yml

@@ -4,7 +4,7 @@ on:
   pull_request
 
 env:
-  WC_MIN_SUPPORTED_VERSION: '7.5.0'
+  WC_MIN_SUPPORTED_VERSION: '7.6.0'
   WP_MIN_SUPPORTED_VERSION: '6.0'
   PHP_MIN_SUPPORTED_VERSION: '7.3'
 

.github/workflows/create-pre-release.yml

@@ -33,24 +33,33 @@ jobs:
         with:
           version: ${{ env.RELEASE_VERSION }}
 
-      - name: "Create a test tag"
-        id: create_tag
-        uses: ./.github/actions/create-tag
-        with:
-          version: ${{ env.RELEASE_VERSION }}
-
       - name: "Generate the changelog"
         id: generate_changelog
         uses: ./.github/actions/process-changelog
         with:
-          release-version: ${{ steps.create_tag.outputs.trimmed-version }}
+          release-version: ${{ steps.create_branch.outputs.trimmed-version }}
 
       - name: "Bump version header"
         env:
-          VERSION: ${{ steps.create_tag.outputs.trimmed-version }}
+          VERSION: ${{ steps.create_branch.outputs.trimmed-version }}
         run: |
           sed -i "s/^ \* Version: .*$/ * Version: $VERSION/" woocommerce-payments.php
 
+      - name: "Commit and push changes"
+        env:
+          BRANCH_NAME: ${{ steps.create_branch.outputs.branch-name }}
+          RELEASE_VERSION: ${{ steps.create_branch.outputs.trimmed-version }}
+        uses: ./.github/actions/commit-push-as-bot
+        with:
+          release-version: ${{ env.RELEASE_VERSION }}
+          branch: ${{ env.BRANCH_NAME }}
+
+      - name: "Create a test tag"
+        id: create_tag
+        uses: ./.github/actions/create-tag
+        with:
+          version: ${{ env.RELEASE_VERSION }}
+
       - name: "Build the plugin"
         id: build_plugin
         uses: ./.github/actions/build

.github/workflows/e2e-test.yml

@@ -23,7 +23,7 @@ env:
   E2E_SLACK_TOKEN:       ${{ secrets.E2E_SLACK_TOKEN }}
   E2E_USE_LOCAL_SERVER:  false
   E2E_RESULT_FILEPATH:   'tests/e2e/results.json'
-  WC_MIN_SUPPORTED_VERSION: '7.5.0'
+  WC_MIN_SUPPORTED_VERSION: '7.6.0'
   NODE_ENV: 'test'
 
 jobs:

.github/workflows/php-lint-test.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   WP_VERSION:        latest
-  WC_MIN_SUPPORTED_VERSION: '7.5.0'
+  WC_MIN_SUPPORTED_VERSION: '7.6.0'
   GUTENBERG_VERSION: latest
   PHP_MIN_SUPPORTED_VERSION: '7.3'
 

.github/workflows/release-pr.yml

@@ -104,13 +104,10 @@ jobs:
         env:
           RELEASE_VERSION: ${{ steps.create_branch.outputs.trimmed-version }}
           BRANCH_NAME: ${{ steps.create_branch.outputs.branch-name }}
-        run: |
-          git config user.name "github-actions[bot]"
-          # We could consider fetching the bot's ID through an API call to be future-proof. Hardcoded for now.
-          # See https://github.com/Automattic/woocommerce-payments/pull/5200#discussion_r1034560144
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -am "Update version and add changelog entries for release $RELEASE_VERSION"
-          git push --set-upstream origin $BRANCH_NAME
+        uses: ./.github/actions/commit-push-as-bot
+        with:
+          release-version: ${{ env.RELEASE_VERSION }}
+          branch: ${{ env.BRANCH_NAME }}
 
       - name: "Create a PR to trunk"
         id: create-pr-to-trunk

assets/css/admin.css

@@ -130,6 +130,16 @@
 	background-size: contain;
 }
 
+.payment-method__brand--afterpay_clearpay {
+	background: no-repeat url( '../images/payment-methods/afterpay-icon.svg' );
+	background-size: contain;
+}
+
+.payment-method__brand--affirm {
+	background: no-repeat url( '../images/payment-methods/affirm-icon.svg' );
+	background-size: contain;
+}
+
 .wc_gateways tr[data-gateway_id='woocommerce_payments'] .payment-method__icon {
 	border: 1px solid #ddd;
 	border-radius: 2px;