Merge branch 'master' into add/boost-e2e-ci-integration

* master: (22 commits) Update PHPUnit coverage configs (#21557) cli: Fix skeleton phpunit config (#21555) Publicize: fix panel issue (#21560) Connection: move IDC args from Sync to Connection (#21147) Debug Helper IDC Simulator: add a button to trigger a remote request (#21535) cli: Fix docker sftp volume mapping (#21547) Add Docs and Tests to the js-redirect js tool (#21541) Debug Helper IDC Simulator: display the last five remote requests (#21534) actions: Build arm64 Docker image too (#21548) CI: Run tests with PHP 8.1, experimentally (#21207) changelogger: Adjust for PHP 8.1 compat (#21209) Publicize: handle main toggle control (#21540) E2E tests: wrapper over tunnel script (#21543) Update storybook monorepo to v6.3.12 (#21527) 10.4: start release cycle (#21546) 10.3 Beta release: changelog and version bumps (#21539) Debug Helper IDC Simulator: add setting to enable/disable Sync (#21532) Debug Helper IDC Simulator: display the IDC options. (#21529) Admin Page: Do not display version numbers on Atomic platform (#21533) Atomic: Supress Development Version status for weekly releases (#21460) ...
Automattic · Oct 28, 2021 · b2c0236 · b2c0236
2 parents 13f72bc + 1961107
commit b2c0236
Show file tree

Hide file tree

Showing 309 changed files with 2,298 additions and 3,656 deletions.
diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php
@@ -61,6 +61,15 @@
 		'timeout' => 15, // 2021-01-18: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 master run, ~5.5-6 for 7.x and 8.0.
 	);
 }
+// Merge this into the above once we decide PHP 8.1 is stable and WP latest works with 8.1.
+$matrix[] = array(
+	'name'         => 'PHP tests: PHP 8.1 WP master',
+	'script'       => 'test-php',
+	'php'          => '8.1',
+	'wp'           => 'master',
+	'timeout'      => 15,
+	'experimental' => true,
+);
 foreach ( array( 'previous', 'master' ) as $wp ) {
 	$matrix[] = array(
 		'name'    => "PHP tests: PHP {$versions['PHP_VERSION']} WP $wp",

diff --git a/.github/files/phpcompatibility-dev-phpcs.xml b/.github/files/phpcompatibility-dev-phpcs.xml
@@ -7,6 +7,8 @@
 	<rule ref="PHPCompatibility">
 		<!-- Doesn't hurt anything, as long as we're also handling the non-Error case. -->
 		<exclude name="PHPCompatibility.Classes.NewClasses.errorFound" />
+		<!-- Doesn't hurt anything, earlier versions ignore attributes. -->
+		<exclude name="PHPCompatibility.Attributes.NewAttributes.Found" />
 		<!-- WordPress provides a polyfill. Feel free to add anything else normally excluded by PHPCompatibilityWP here if necessary. -->
 		<exclude name="PHPCompatibility.FunctionUse.NewFunctions.sodium_crypto_box_sealFound" />
 		<exclude name="PHPCompatibility.Classes.NewClasses.sodiumexceptionFound" />

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -8,6 +8,13 @@ on:
       - 'tools/docker/config/*'
       - '.github/versions.sh'
       - '.github/workflows/build-docker.yml'
+  pull_request:
+    paths:
+      - 'tools/docker/Dockerfile'
+      - 'tools/docker/bin/run.sh'
+      - 'tools/docker/config/*'
+      - '.github/versions.sh'
+      - '.github/workflows/build-docker.yml'
 concurrency:
   group: build-docker-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
@@ -19,11 +26,19 @@ jobs:
     permissions:
       packages: write
       contents: read
-    timeout-minutes: 20  # 2021-10-14: Test run took 5 minutes, but there's lots of downloading involved.
+    timeout-minutes: 60  # 2021-10-26: Build for arm64 is S-L-O-W. Sigh.
 
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v1
         with:
@@ -46,16 +61,25 @@ jobs:
           echo "::set-output name=node-version::$NODE_VERSION"
           echo "::set-output name=pnpm-version::$PNPM_VERSION"
 
+          # We're not git-tagging for the env. Just tag all master builds as latest.
+          if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
+            echo "::set-output name=tags::type=raw,latest"
+            echo "::set-output name=images::automattic/jetpack-wordpress-dev%0Aghcr.io/automattic/jetpack-wordpress-dev"
+          elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
+            echo "::set-output name=tags::type=ref,event=pr"
+            echo "::set-output name=images::ghcr.io/automattic/jetpack-wordpress-dev"
+          else
+            echo "Unknown GITHUB_EVENT_NAME $GITHUB_EVENT_NAME"
+            exit 1
+          fi
+
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v3
         with:
-          # We're not git-tagging for the env. Just tag all builds as latest.
-          tags: |
-            type=raw,latest
-          images: |
-            automattic/jetpack-wordpress-dev
-            ghcr.io/automattic/jetpack-wordpress-dev
+          flavor: latest=false
+          tags: ${{ steps.buildargs.outputs.tags }}
+          images: ${{ steps.buildargs.outputs.images }}
           labels: |
             org.opencontainers.image.title=Jetpack Development Environment
             org.opencontainers.image.description=Unified environment for developing in the Jetpack Monorepo using Docker containers.
@@ -65,6 +89,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: tools/docker
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -161,7 +161,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '5.6', '7.0', '7.4', '8.0' ]
+        php-versions: [ '5.6', '7.0', '7.4', '8.0', '8.1' ]
         experimental: [ false ]
 
     steps:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -90,6 +90,7 @@ jobs:
 
       - name: Run project tests
         env:
+          EXPERIMENTAL: ${{ matrix.experimental && 'true' || 'false' }}
           CHANGED: ${{ steps.changed.outputs.projects }}
         run: |
           EXIT=0
@@ -109,7 +110,7 @@ jobs:
               if [[ "$WP_BRANCH" != 'none' ]]; then
                 DIR="/tmp/wordpress-$WP_BRANCH/src/wp-content/$SLUG"
               fi
-            elif [[ "$WP_BRANCH" != 'latest' && "$WP_BRANCH" != 'none' ]]; then
+            elif [[ "$WP_BRANCH" != 'latest' && "$WP_BRANCH" != 'none' && "$EXPERIMENTAL" != "true" ]]; then
               echo "Skipping $SLUG, only plugins run for WP_BRANCH = $WP_BRANCH"
               continue
             fi