Skip to content
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

Internal: Update test runner script to include new data structure #1354

Merged
merged 17 commits into from
Mar 24, 2023
Merged

Internal: Update test runner script to include new data structure #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1c74d1a
Update test runner script to include new data structure
caendesilva Mar 24, 2023
3932648
Bump test runner script
caendesilva Mar 24, 2023
86a027f
Change Git command
caendesilva Mar 24, 2023
b843856
Bump test runner script
caendesilva Mar 24, 2023
bf9bcef
Support getting branch from arguments
caendesilva Mar 24, 2023
46436e5
Bump test runner script
caendesilva Mar 24, 2023
ef6f93e
Document GitHub ref
caendesilva Mar 24, 2023
5fd2f0e
Pass GitHub ref
caendesilva Mar 24, 2023
8076b54
Use expression instead of environment variable
caendesilva Mar 24, 2023
7e58014
Call environment variable with proper expression syntax
caendesilva Mar 24, 2023
ccef288
Update variable name
caendesilva Mar 24, 2023
4acc82c
Add upcoming docs
caendesilva Mar 24, 2023
86b9f88
Bump test runner script
caendesilva Mar 24, 2023
66a829d
Apply fixes from StyleCI
StyleCIBot Mar 24, 2023
08265a1
Revert "Add upcoming docs"
caendesilva Mar 24, 2023
72ecb86
Merge branch 'update-internal-ci-server-script' of github.com:hydephp…
caendesilva Mar 24, 2023
2d6fa76
Revert "Call environment variable with proper expression syntax"
caendesilva Mar 24, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:

- name: Ping statistics server with test results
run: |
curl https://raw.githubusercontent.com/hydephp/develop/08308fb9e9b4f72321bf90d37a8c9143a938a231/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo CI Matrix" ${{ secrets.OPENANALYTICS_TOKEN }}
curl https://raw.githubusercontent.com/hydephp/develop/4acc82cfb5ff431302dcbb2b11c5331efd47c872/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo CI Matrix" ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}

system-testing:
strategy:
Expand Down Expand Up @@ -212,8 +212,8 @@ jobs:
- name: Ping statistics server with test results
run: |
cp build/junit.xml report.xml
curl https://raw.githubusercontent.com/hydephp/develop/08308fb9e9b4f72321bf90d37a8c9143a938a231/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo PR Test" ${{ secrets.OPENANALYTICS_TOKEN }}
curl https://raw.githubusercontent.com/hydephp/develop/4acc82cfb5ff431302dcbb2b11c5331efd47c872/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo PR Test" ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}

- name: Upload coverage artifacts
uses: actions/upload-artifact@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/smoke-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:

- name: Ping statistics server with test results
run: |
curl https://raw.githubusercontent.com/hydephp/develop/08308fb9e9b4f72321bf90d37a8c9143a938a231/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo Smoke Tests" ${{ secrets.OPENANALYTICS_TOKEN }}
curl https://raw.githubusercontent.com/hydephp/develop/4acc82cfb5ff431302dcbb2b11c5331efd47c872/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo Smoke Tests" ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}


test-coverage:
Expand Down Expand Up @@ -68,5 +68,5 @@ jobs:

- name: Ping statistics server with test results
run: |
curl https://raw.githubusercontent.com/hydephp/develop/08308fb9e9b4f72321bf90d37a8c9143a938a231/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo Smoke Tests - Coverage" ${{ secrets.OPENANALYTICS_TOKEN }}
curl https://raw.githubusercontent.com/hydephp/develop/4acc82cfb5ff431302dcbb2b11c5331efd47c872/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo Smoke Tests - Coverage" ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}
8 changes: 4 additions & 4 deletions .github/workflows/test-pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
- name: Ping statistics server with test results
run: |
cp build/junit.xml report.xml
curl https://raw.githubusercontent.com/hydephp/develop/08308fb9e9b4f72321bf90d37a8c9143a938a231/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo PR Test" ${{ secrets.OPENANALYTICS_TOKEN }}
curl https://raw.githubusercontent.com/hydephp/develop/4acc82cfb5ff431302dcbb2b11c5331efd47c872/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo PR Test" ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}

test-matrix:
strategy:
Expand All @@ -77,5 +77,5 @@ jobs:

- name: Ping statistics server with test results
run: |
curl https://raw.githubusercontent.com/hydephp/develop/08308fb9e9b4f72321bf90d37a8c9143a938a231/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo PR Matrix" ${{ secrets.OPENANALYTICS_TOKEN }}
curl https://raw.githubusercontent.com/hydephp/develop/4acc82cfb5ff431302dcbb2b11c5331efd47c872/monorepo/scripts/ping-openanalytics-testrunner.php -o ping.php
php ping.php "Monorepo PR Matrix" ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}
7 changes: 6 additions & 1 deletion monorepo/scripts/ping-openanalytics-testrunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
/**
* @internal This script is used to ping the OpenAnalytics server with the test results.
*
* @example php ping.php 'Monorepo Smoke Tests' ${{ secrets.OPENANALYTICS_TOKEN }}
* @example php ping.php 'Monorepo Smoke Tests' ${{ secrets.OPENANALYTICS_TOKEN }} ${{ github.ref_name }}
*
* @uses vendor/bin/pest --stop-on-failure --log-junit report.xml
*/
echo "Pinging statistics server\n";

$runner = $argv[1] ?? exit(400);
$token = $argv[2] ?? null;
$branch = $argv[3] ?? null;
if ($token === null) {
// Probably running in a fork
echo "::warning:: No token provided, skipping ping\n";
Expand Down Expand Up @@ -56,6 +57,10 @@
$data[explode('=', $pair)[0]] = explode('=', $pair)[1];
}

$data['commit'] = shell_exec('git rev-parse HEAD');
$data['branch'] = $branch ?? shell_exec('git branch --show-current');
$data['runner_os'] = php_uname('s');

curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));

$resp = curl_exec($curl);
Expand Down