Merge branch 'release/G23.beans'

.github/workflows/tests-php.yml

@@ -7,6 +7,7 @@ jobs:
       matrix:
         suite:
           # - acceptance
+          - ct1_integration
           - functional
           - integration
           - restv1 --group="capacity"

.github/workflows/zip.yml

@@ -7,6 +7,12 @@ on:
         description: 'Zip type: 0 = dev, 1 = production'
         required: false
         default: '0'
+      slack_channel:
+        description: 'Slack channel ID to post to'
+        required: false
+      slack_thread:
+        description: 'Slack thread to post to'
+        required: false
 jobs:
   zip:
     runs-on: ubuntu-latest
@@ -25,18 +31,16 @@ jobs:
       - name: Setup branch for consumption in subsequent steps
         id: settings
         run: |
-          echo "::set-output name=branch::${JOB_BRANCH}"
+          echo "branch=${JOB_BRANCH}" >> $GITHUB_OUTPUT
       # -----------------------------------------------------------------------------
       # Setup SSH keys and known_hosts
       # ------------------------------------------------------------------------------
-      - name: Setup SSH keys and known_hosts
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan github.com >> ~/.ssh/known_hosts
-          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-          ssh-add - <<< "${{ secrets.GH_ACTIONS_SSH_KEY }}"
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.GH_ACTIONS_SSH_KEY }}
+          name: id_rsa
+          known_hosts: github.com
       # ------------------------------------------------------------------------------
       # Checkout the repo and tut
       # ------------------------------------------------------------------------------
@@ -55,6 +59,14 @@ jobs:
           ref: main
           path: tut
           fetch-depth: 1
+      - name: Checkout jenkins-scripts
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GH_BOT_TOKEN }}
+          repository: the-events-calendar/jenkins-scripts
+          ref: main
+          path: jenkins-scripts
+          fetch-depth: 1
       # ------------------------------------------------------------------------------
       # Determine if we need to zip
       # ------------------------------------------------------------------------------
@@ -74,10 +86,11 @@ jobs:
           if [ "${JOB_FINAL}" == "1" ]; then
             FILENAME="${ZIP_NAME}.${VERSION}.zip"
           fi
-          echo "::set-output name=value::${FILENAME}"
+          echo "value=${FILENAME}" >> $GITHUB_OUTPUT
           echo $FILENAME
       - name: Check if zip already exists
         uses: the-events-calendar/action-s3-utility@main
+        if: github.event.inputs.final != '1'
         id: s3_zip
         continue-on-error: true
         env:
@@ -95,7 +108,7 @@ jobs:
         if: steps.s3_zip.outcome != 'success'
         id: get-composer-cache-dir
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
       - uses: actions/cache@v2
         if: steps.s3_zip.outcome != 'success'
         id: composer-cache
@@ -130,6 +143,11 @@ jobs:
         working-directory: ./tut
         run: |
           composer install --no-dev -o --ignore-platform-reqs
+      - name: Install jenkins-scripts composer dependencies
+        working-directory: ./jenkins-scripts
+        run: |
+          composer install --no-dev -o --ignore-platform-reqs
+          cp script-config-sample.yml script-config.yml
       # ------------------------------------------------------------------------------
       # Zip
       # ------------------------------------------------------------------------------
@@ -144,10 +162,13 @@ jobs:
           REPO_NAME=$( echo $GITHUB_REPOSITORY | sed "s/the-events-calendar\///")
           mkdir zip
           if [ "${JOB_FINAL}" == "1" ]; then
-            $TUT_BIN package --plugin=$REPO_NAME --branch="${{ steps.settings.outputs.branch }}" --ignore-view-versions --output="./zip" --final -v
+            output=$($TUT_BIN package --plugin=$REPO_NAME --branch="${{ steps.settings.outputs.branch }}" --ignore-view-versions --output=./zip --final -v)
           else
-            $TUT_BIN package --plugin=$REPO_NAME --branch="${{ steps.settings.outputs.branch }}" --ignore-view-versions --output="./zip" -v
+            output=$($TUT_BIN package --plugin=$REPO_NAME --branch="${{ steps.settings.outputs.branch }}" --ignore-view-versions --output=./zip -v)
           fi
+          echo "$output"
+          touch ${GITHUB_WORKSPACE}/results.txt
+          echo "$output" > ${GITHUB_WORKSPACE}/results.txt
           mv zip ${GITHUB_WORKSPACE}/zip
       - uses: the-events-calendar/action-s3-utility@main
         if: steps.s3_zip.outcome != 'success'
@@ -161,3 +182,19 @@ jobs:
           S3_ENDPOINT: ${{ secrets.S3_ENDPOINT }}
           COMMAND: sync
           SOURCE_DIR: /github/workspace/zip
+      - name: Maybe prep data for Slack message
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.slack_channel != '' && github.event.inputs.slack_thread != '' && steps.s3_zip.outcome == 'success'
+        working-directory: ../
+        run: |
+          touch ${GITHUB_WORKSPACE}/results.txt
+          echo "Packaging results" >> ${GITHUB_WORKSPACE}/results.txt
+          echo "-----------------" >> ${GITHUB_WORKSPACE}/results.txt
+          echo "" >> ${GITHUB_WORKSPACE}/results.txt
+          echo "Successfully packaged:" >> ${GITHUB_WORKSPACE}/results.txt
+          echo "* ./zip/\"${{ steps.file_name.outputs.value }}\"" >> ${GITHUB_WORKSPACE}/results.txt
+          echo "" >> ${GITHUB_WORKSPACE}/results.txt
+      - name: Maybe notify in Slack
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.slack_channel != '' && github.event.inputs.slack_thread != ''
+        working-directory: ../
+        run: |
+          php ${GITHUB_WORKSPACE}/jenkins-scripts/mt-jenkins package:send-results --channel ${{ github.event.inputs.slack_channel }} --ts ${{ github.event.inputs.slack_thread }} --results-file "${GITHUB_WORKSPACE}/results.txt" --slack-token ${{ secrets.SLACK_TOKEN }} --build-url https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}

changelog.txt

@@ -1,8 +1,21 @@
 == Changelog ==
 
-= [TBD] TBD =
+= [5.5.7] TBD =
 
+* Fix - Resolve provisional IDs properly on the event edit screen for ticket management actions. [ET-1632]
+* Fix - Fixed Ticket Commerce cart cookies not getting saved. [ET-1629]
+* Tweak - Updated Currency options in Tickets Commerce settings for Croatian users from Kuna (HRK) to Euro (EUR). [ET-1625]
+* Tweak - Updated Attendee Registration Fields upsell notice to only display in admin dashboard. [CT-67]
+* Enhancement - Added currency format options to alter currency decimal separator, thousand separator, and number of decimal places. [ET-1608]
+
+= [5.5.6] 2023-01-16 =
+
+* Tweak - Updated the settings description for stock handling options. [ET-1603]
 * Tweak - Added the `tribe-tickets__tickets-item--shared-capacity` wrapper class for tickets having shared capacity. [ETP-841]
+* Tweak - Added a dashboard notice for sites running PHP versions lower than 7.4 to alert them that the minimum version of PHP is changing to 7.4 in February 2023.
+* Enhancement - Added search capabilities to the Tickets Commerce Orders report page. [ET-1259]
+* Fix - Allow loading attendance page with `event_id` params that use The Events Calendar provisional IDs. [ET-1624]
+* Language - 4 new strings added, 43 updated, 0 fuzzied, and 2 obsoleted
 
 = [5.5.5] 2022-12-08 =
 

event-tickets.php

@@ -3,7 +3,7 @@
 Plugin Name: Event Tickets
 Plugin URI:  https://evnt.is/1acb
 Description: Event Tickets allows you to sell basic tickets and collect RSVPs from any post, page, or event.
-Version: 5.5.6
+Version: 5.5.7
 Author: The Events Calendar
 Author URI: https://evnt.is/1aor
 License: GPLv2 or later