Skip to content

Fix nightly workflow dispatch #16662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix nightly workflow dispatch #16662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions .github/nightly_matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<?php

const BRANCHES = ['master', 'PHP-8.4', 'PHP-8.3', 'PHP-8.2', 'PHP-8.1'];
const BRANCHES = [
['ref' => 'master', 'version' => [8, 5]],
['ref' => 'PHP-8.4', 'version' => [8, 4]],
['ref' => 'PHP-8.3', 'version' => [8, 3]],
['ref' => 'PHP-8.2', 'version' => [8, 2]],
['ref' => 'PHP-8.1', 'version' => [8, 1]],
];

function get_branch_commit_cache_file_path(): string {
return dirname(__DIR__) . '/branch-commit-cache.json';
Expand All @@ -15,21 +21,31 @@ function get_branches() {

$changed_branches = [];
foreach (BRANCHES as $branch) {
$previous_commit_hash = $branch_commit_map[$branch] ?? null;
$current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch));
$previous_commit_hash = $branch_commit_map[$branch['ref']] ?? null;
$current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch['ref']));

if ($previous_commit_hash !== $current_commit_hash) {
$changed_branches[] = $branch;
}

$branch_commit_map[$branch] = $current_commit_hash;
$branch_commit_map[$branch['ref']] = $current_commit_hash;
}

file_put_contents($branch_commit_cache_file, json_encode($branch_commit_map));

return $changed_branches;
}

function get_current_version(): array {
$file = dirname(__DIR__) . '/main/php_version.h';
$content = file_get_contents($file);
preg_match('(^#define PHP_MAJOR_VERSION (?<num>\d+)$)m', $content, $matches);
$major = (int) $matches['num'];
preg_match('(^#define PHP_MINOR_VERSION (?<num>\d+)$)m', $content, $matches);
$minor = (int) $matches['num'];
return [$major, $minor];
}

$trigger = $argv[1] ?? 'schedule';
$attempt = (int) ($argv[2] ?? 1);
$monday = date('w', time()) === '1';
Expand All @@ -40,7 +56,9 @@ function get_branches() {
@unlink(get_branch_commit_cache_file_path());
}
$branch = $argv[3] ?? 'master';
$branches = $branch === 'master' ? get_branches() : [$branch];
$branches = $branch === 'master'
? get_branches()
: [['ref' => $branch, 'version' => get_current_version()]];

$f = fopen(getenv('GITHUB_OUTPUT'), 'a');
fwrite($f, 'branches=' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n");
Expand Down
84 changes: 14 additions & 70 deletions .github/workflows/root.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,78 +36,22 @@ jobs:
uses: ./.github/actions/notify-slack
with:
token: ${{ secrets.ACTION_MONITORING_SLACK }}
NIGHTLY_MASTER:
name: master
NIGHTLY:
needs: GENERATE_MATRIX
if: contains(needs.GENERATE_MATRIX.outputs.branches, 'master')
name: ${{ matrix.branch.ref }}
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
uses: ./.github/workflows/nightly.yml
strategy:
fail-fast: false
matrix:
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
with:
asan_ubuntu_version: '20.04'
branch: master
community_verify_type_inference: true
libmysqlclient_with_mysqli: false
run_alpine: true
run_macos_arm64: true
ubuntu_version: '22.04'
windows_version: '2022'
secrets: inherit
NIGHTLY_84:
name: PHP-8.4
needs: GENERATE_MATRIX
if: contains(needs.GENERATE_MATRIX.outputs.branches, 'PHP-8.4')
uses: ./.github/workflows/nightly.yml
with:
asan_ubuntu_version: '20.04'
branch: PHP-8.4
community_verify_type_inference: true
libmysqlclient_with_mysqli: false
run_alpine: true
run_macos_arm64: true
ubuntu_version: '22.04'
windows_version: '2022'
secrets: inherit
NIGHTLY_83:
name: PHP-8.3
needs: GENERATE_MATRIX
if: contains(needs.GENERATE_MATRIX.outputs.branches, 'PHP-8.3')
uses: ./.github/workflows/nightly.yml
with:
asan_ubuntu_version: '20.04'
branch: PHP-8.3
community_verify_type_inference: false
libmysqlclient_with_mysqli: false
run_alpine: false
run_macos_arm64: false
ubuntu_version: '22.04'
windows_version: '2019'
secrets: inherit
NIGHTLY_82:
name: PHP-8.2
needs: GENERATE_MATRIX
if: contains(needs.GENERATE_MATRIX.outputs.branches, 'PHP-8.2')
uses: ./.github/workflows/nightly.yml
with:
asan_ubuntu_version: '20.04'
branch: PHP-8.2
community_verify_type_inference: false
libmysqlclient_with_mysqli: false
run_alpine: false
run_macos_arm64: false
ubuntu_version: '20.04'
windows_version: '2019'
secrets: inherit
NIGHTLY_81:
name: PHP-8.1
needs: GENERATE_MATRIX
if: contains(needs.GENERATE_MATRIX.outputs.branches, 'PHP-8.1')
uses: ./.github/workflows/nightly.yml
with:
asan_ubuntu_version: '20.04'
branch: PHP-8.1
community_verify_type_inference: false
libmysqlclient_with_mysqli: true
run_alpine: false
run_macos_arm64: false
ubuntu_version: '20.04'
windows_version: '2019'
branch: ${{ matrix.branch.ref }}
community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
ubuntu_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9) && '22.04' || '20.04' }}
windows_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '2022' || '2019' }}
secrets: inherit