Skip to content

Commit de1577d

Browse files
deansheatherdeansheather
committed
Merge branch 'main' into dean/scaletest
2 parents a6a36f7 + 306fe4a commit de1577d

File tree

102 files changed

+2258
-1475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2258
-1475
lines changed

‎.github/semantic.yaml

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.github/workflows/coder.yaml

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,23 @@ jobs:
338338
else
339339
echo ::set-output name=cover::false
340340
fi
341-
set -x
342-
gotestsum --junitfile="gotests.xml" --jsonfile="gotestsum.json" --packages="./..." --debug -- -parallel=8 -timeout=3m -short -failfast $COVERAGE_FLAGS
341+
set +e
342+
gotestsum --junitfile="gotests.xml" --jsonfile="gotestsum.json" --packages="./..." --debug -- -parallel=8 -timeout=5m -short -failfast $COVERAGE_FLAGS
343+
ret=$?
344+
if ((ret)); then
345+
# Eternalize test timeout logs because "re-run failed" erases
346+
# artifacts and gotestsum doesn't always capture it:
347+
# https://github.com/gotestyourself/gotestsum/issues/292
348+
# Multiple test packages could've failed, each one may or may
349+
# not run into the edge case. PS. Don't summon ShellCheck here.
350+
for testWithStack in $(grep 'panic: test timed out' gotestsum.json | grep -E -o '("Test":[^,}]*)'); do
351+
if [ -n "$testWithStack" ] && grep -q "${testWithStack}.*PASS" gotestsum.json; then
352+
echo "Conditions met for gotestsum stack trace missing bug, outputting panic trace:"
353+
grep -A 999999 "${testWithStack}.*panic: test timed out" gotestsum.json
354+
fi
355+
done
356+
fi
357+
exit $ret
343358
344359
- uses: actions/upload-artifact@v3
345360
if: success() || failure()
@@ -348,6 +363,13 @@ jobs:
348363
path: ./gotestsum.json
349364
retention-days: 7
350365

366+
- uses: actions/upload-artifact@v3
367+
if: success() || failure()
368+
with:
369+
name: gotests-${{ matrix.os }}.xml
370+
path: ./gotests.xml
371+
retention-days: 30
372+
351373
- uses: codecov/codecov-action@v3
352374
# This action has a tendency to error out unexpectedly, it has
353375
# the `fail_ci_if_error` option that defaults to `false`, but
@@ -407,7 +429,24 @@ jobs:
407429
terraform_wrapper: false
408430

409431
- name: Test with PostgreSQL Database
410-
run: make test-postgres
432+
run: |
433+
set +e
434+
make test-postgres
435+
ret=$?
436+
if ((ret)); then
437+
# Eternalize test timeout logs because "re-run failed" erases
438+
# artifacts and gotestsum doesn't always capture it:
439+
# https://github.com/gotestyourself/gotestsum/issues/292
440+
# Multiple test packages could've failed, each one may or may
441+
# not run into the edge case. PS. Don't summon ShellCheck here.
442+
for testWithStack in $(grep 'panic: test timed out' gotestsum.json | grep -E -o '("Test":[^,}]*)'); do
443+
if [ -n "$testWithStack" ] && grep -q "${testWithStack}.*PASS" gotestsum.json; then
444+
echo "Conditions met for gotestsum stack trace missing bug, outputting panic trace:"
445+
grep -A 999999 "${testWithStack}.*panic: test timed out" gotestsum.json
446+
fi
447+
done
448+
fi
449+
exit $ret
411450
412451
- uses: actions/upload-artifact@v3
413452
if: success() || failure()
@@ -416,6 +455,13 @@ jobs:
416455
path: ./gotestsum.json
417456
retention-days: 7
418457

458+
- uses: actions/upload-artifact@v3
459+
if: success() || failure()
460+
with:
461+
name: gotests-postgres.xml
462+
path: ./gotests.xml
463+
retention-days: 30
464+
419465
- uses: codecov/codecov-action@v3
420466
# This action has a tendency to error out unexpectedly, it has
421467
# the `fail_ci_if_error` option that defaults to `false`, but

‎.github/workflows/pr.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Lint PR
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- reopened
8+
- edited
9+
- synchronize
10+
11+
jobs:
12+
main:
13+
name: Validate PR title
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: amannn/action-semantic-pull-request@v5
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
with:
20+
requireScope: false

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157

158158
- name: Publish release
159159
run: |
160-
./scripts/publish_release.sh \
160+
./scripts/release/publish.sh \
161161
${{ (github.event.inputs.dry_run || github.event.inputs.snapshot) && '--dry-run' }} \
162162
./build/*_installer.exe \
163163
./build/*.zip \

0 commit comments

Comments
 (0)