Skip to content

Commit c5cb816

Browse files
committed
more output
1 parent 103aa24 commit c5cb816

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

.github/workflows/test-all.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,6 @@ jobs:
4141
- name: install Chrome stable
4242
run: |
4343
npx @puppeteer/browsers install chrome@stable
44-
chromeVersionString=$(ls chrome)
45-
if [ "$CHROME_VALIDATED_VERSION" != "$chromeVersionString" ]; then
46-
echo "::warning ::The Chrome version doesn't match the previously validated version. Consider updating CHROME_VALIDATED_VERSION in the GitHub workflow if tests pass."
47-
echo "::warning ::Previously validated version: ${CHROME_VALIDATED_VERSION} vs. Installed version: $chromeVersionString"
48-
echo "CHROME_VERSION_NOTES=$CHROME_VERSION_MISMATCH_MESSAGE" >> "$GITHUB_ENV"
49-
fi
50-
- name: Test Evn TEMP
51-
run: |
52-
echo $CHROME_VERSION_NOTES=$CHROME_VERSION_MISMATCH_MESSAGE
5344
- uses: actions/checkout@v3
5445
- name: Set up Node (16)
5546
uses: actions/setup-node@v3
@@ -126,6 +117,15 @@ jobs:
126117
- name: install Chrome stable
127118
run: |
128119
npx @puppeteer/browsers install chrome@stable
120+
chromeVersionString=$(ls chrome)
121+
if [ "$CHROME_VALIDATED_VERSION" != "$chromeVersionString" ]; then
122+
echo "::warning ::The Chrome version doesn't match the previously validated version. Consider updating CHROME_VALIDATED_VERSION in the GitHub workflow if tests pass."
123+
echo "::warning ::Previously validated version: ${CHROME_VALIDATED_VERSION} vs. Installed version: $chromeVersionString"
124+
echo "CHROME_VERSION_NOTES=$CHROME_VERSION_MISMATCH_MESSAGE" >> "$GITHUB_ENV"
125+
fi
126+
- name: Test Evn TEMP
127+
run: |
128+
echo $CHROME_VERSION_NOTES=$CHROME_VERSION_MISMATCH_MESSAGE
129129
- name: Download build archive
130130
uses: actions/download-artifact@v3
131131
with:

.github/workflows/test-changed-auth.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,25 @@ env:
2424
CHROMEDRIVER_CDNURL: https://googlechromelabs.github.io/
2525
CHROMEDRIVER_CDNBINARIESURL: https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/
2626
CHROME_VALIDATED_VERSION: blinux-120.0.6099.71
27-
CHROME_VERSION_MISMATCH_MESSAGE: "The Chrome version doesn't match the previously validated version. Consider updating CHROME_VALIDATED_VERSION in the GitHub workflow if tests pass."
2827
# Bump Node memory limit
2928
NODE_OPTIONS: "--max_old_space_size=4096"
3029

3130
jobs:
3231
test-chrome:
3332
name: Test Auth on Chrome and Node If Changed
3433
runs-on: ubuntu-latest
35-
3634
steps:
3735
# install Chrome first, so the correct version of webdriver can be installed by chromedriver
3836
# when setting up the repo
3937
#
4038
# Note: we only need to check the chrome version change in one job as the warning annotation
4139
# is appended to the entire workflow results, not just this job's results.
4240
- name: install Chrome stable
41+
env: env: CHROME_VERSION_MISMATCH_MESSAGE: "The Chrome version doesn't match the previously validated version. Consider updating CHROME_VALIDATED_VERSION in the GitHub workflow if tests pass."
4342
run: |
4443
npx @puppeteer/browsers install chrome@stable
4544
chromeVersionString=$(ls chrome)
46-
if [ "$CHROME_VALIDATED_VERSION" != "$chromeVersionString" ]; then
45+
if [ "$CHROME_VALIDATED_VERSION" != "$chromeVersionString" ]; then
4746
echo "::warning ::The Chrome version doesn't match the previously validated version. Consider updating CHROME_VALIDATED_VERSION in the GitHub workflow if tests pass."
4847
echo "::warning ::Previously validated version: ${CHROME_VALIDATED_VERSION} vs. Installed version: $chromeVersionString"
4948
echo "CHROME_VERSION_NOTES=$CHROME_VERSION_MISMATCH_MESSAGE" >> "$GITHUB_ENV"

scripts/ci-test/test_changed.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@ async function runTests(config: TestConfig) {
8080
process.exit(0);
8181
} catch (e) {
8282
console.error(chalk`{red ${e}}`);
83+
84+
const chrome_notes = process.env.CHROME_VERSION_NOTES;
85+
if(chrome_notes) {
86+
console.error(chrome_notes)
87+
} else {
88+
console.error("No chrome notes!")
89+
}
90+
8391
process.exit(1);
8492
}
8593
}

scripts/run_tests_in_ci.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ const argv = yargs.options({
9191
const chrome_notes = process.env.CHROME_VERSION_NOTES;
9292
if(chrome_notes) {
9393
console.error(chrome_notes)
94+
} else {
95+
console.error("No chrome notes!")
9496
}
9597

9698
writeLogs('Failure', name, stdout + '\n' + stderr);

0 commit comments

Comments
 (0)