Build/Test Tools: Correct the context variable being used when auto-retrying failed and cancelled workflows.

desrosj · desrosj · commit 69b9ecc54e2b · 2022-08-31T14:29:22.000Z
The correct variable here is `github.run_attempt`, which represents the unique number for each attempt of a particular workflow run in a repository. The `github.run_number` currently being used represents the unique number for each run of a particular workflow in a repository. Follow up to [53947]. Fixes #56407. git-svn-id: https://develop.svn.wordpress.org/trunk@54039 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -182,7 +182,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.phpcs.result == 'cancelled' || needs.phpcs.result == 'failure' ||
         needs.jshint.result == 'cancelled' || needs.jshint.result == 'failure'
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
@@ -139,7 +139,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.e2e-tests.result == 'cancelled' || needs.e2e-tests.result == 'failure'
       )
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
@@ -107,7 +107,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.test-js.result == 'cancelled' || needs.test-js.result == 'failure'
       )
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
@@ -123,7 +123,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.php-compatibility.result == 'cancelled' || needs.php-compatibility.result == 'failure'
       )
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
@@ -255,7 +255,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
       )
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
@@ -202,7 +202,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.test-coverage-report.result == 'cancelled' || needs.test-coverage-report.result == 'failure'
       )
diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml
@@ -180,7 +180,7 @@ jobs:
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
-      github.run_number < 2 &&
+      github.run_attempt < 2 &&
       (
         needs.test-npm.result == 'cancelled' || needs.test-npm.result == 'failure' ||
         needs.test-npm-macos.result == 'cancelled' || needs.test-npm-macos.result == 'failure'

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ jobs:`
`182`	`182`	`always() &&`
`183`	`183`	`github.repository == 'WordPress/wordpress-develop' &&`
`184`	`184`	`github.event_name != 'pull_request' &&`
`185`		`- github.run_number < 2 &&`
	`185`	`+ github.run_attempt < 2 &&`
`186`	`186`	`(`
`187`	`187`	`needs.phpcs.result == 'cancelled' \|\| needs.phpcs.result == 'failure' \|\|`
`188`	`188`	`needs.jshint.result == 'cancelled' \|\| needs.jshint.result == 'failure'`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ jobs:`
`139`	`139`	`always() &&`
`140`	`140`	`github.repository == 'WordPress/wordpress-develop' &&`
`141`	`141`	`github.event_name != 'pull_request' &&`
`142`		`- github.run_number < 2 &&`
	`142`	`+ github.run_attempt < 2 &&`
`143`	`143`	`(`
`144`	`144`	`needs.e2e-tests.result == 'cancelled' \|\| needs.e2e-tests.result == 'failure'`
`145`	`145`	`)`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ jobs:`
`107`	`107`	`always() &&`
`108`	`108`	`github.repository == 'WordPress/wordpress-develop' &&`
`109`	`109`	`github.event_name != 'pull_request' &&`
`110`		`- github.run_number < 2 &&`
	`110`	`+ github.run_attempt < 2 &&`
`111`	`111`	`(`
`112`	`112`	`needs.test-js.result == 'cancelled' \|\| needs.test-js.result == 'failure'`
`113`	`113`	`)`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ jobs:`
`123`	`123`	`always() &&`
`124`	`124`	`github.repository == 'WordPress/wordpress-develop' &&`
`125`	`125`	`github.event_name != 'pull_request' &&`
`126`		`- github.run_number < 2 &&`
	`126`	`+ github.run_attempt < 2 &&`
`127`	`127`	`(`
`128`	`128`	`needs.php-compatibility.result == 'cancelled' \|\| needs.php-compatibility.result == 'failure'`
`129`	`129`	`)`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ jobs:`
`255`	`255`	`always() &&`
`256`	`256`	`github.repository == 'WordPress/wordpress-develop' &&`
`257`	`257`	`github.event_name != 'pull_request' &&`
`258`		`- github.run_number < 2 &&`
	`258`	`+ github.run_attempt < 2 &&`
`259`	`259`	`(`
`260`	`260`	`needs.test-php.result == 'cancelled' \|\| needs.test-php.result == 'failure'`
`261`	`261`	`)`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ jobs:`
`202`	`202`	`always() &&`
`203`	`203`	`github.repository == 'WordPress/wordpress-develop' &&`
`204`	`204`	`github.event_name != 'pull_request' &&`
`205`		`- github.run_number < 2 &&`
	`205`	`+ github.run_attempt < 2 &&`
`206`	`206`	`(`
`207`	`207`	`needs.test-coverage-report.result == 'cancelled' \|\| needs.test-coverage-report.result == 'failure'`
`208`	`208`	`)`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ jobs:`
`180`	`180`	`always() &&`
`181`	`181`	`github.repository == 'WordPress/wordpress-develop' &&`
`182`	`182`	`github.event_name != 'pull_request' &&`
`183`		`- github.run_number < 2 &&`
	`183`	`+ github.run_attempt < 2 &&`
`184`	`184`	`(`
`185`	`185`	`needs.test-npm.result == 'cancelled' \|\| needs.test-npm.result == 'failure' \|\|`
`186`	`186`	`needs.test-npm-macos.result == 'cancelled' \|\| needs.test-npm-macos.result == 'failure'`