Skip to content

Commit 4a75d91

Browse files
committed
merge main
2 parents 18d4fc6 + 8571be3 commit 4a75d91

File tree

227 files changed

+18009
-4758
lines changed

Some content is hidden

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

227 files changed

+18009
-4758
lines changed

.github/buildomat/build-and-test.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,13 @@ ptime -m cargo build -Z unstable-options --timings=json \
128128
#
129129
# We apply our own timeout to ensure that we get a normal failure on timeout
130130
# rather than a buildomat timeout. See oxidecomputer/buildomat#8.
131-
#
131+
# To avoid too many tests running at the same time, we choose a test threads
132+
# 2 less (negative 2) than the default. This avoids many test flakes where
133+
# the test would have worked but the system was too overloaded and tests
134+
# take longer than their default timeouts.
132135
banner test
133-
ptime -m timeout 2h cargo nextest run --profile ci --locked --verbose
136+
ptime -m timeout 2h cargo nextest run --profile ci --locked --verbose \
137+
--test-threads -2
134138

135139
#
136140
# https://github.com/nextest-rs/nextest/issues/16
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Upload JUnit from Buildomat to Trunk
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
check_run_id:
7+
description: Buildomat's gong.run.github_id
8+
type: string
9+
required: true
10+
check_run:
11+
types: [completed]
12+
13+
permissions:
14+
contents: read
15+
checks: read
16+
pull-requests: read
17+
18+
jobs:
19+
upload:
20+
name: Upload
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout the source code
24+
uses: actions/checkout@v5
25+
26+
- name: Upload JUnit XML to Trunk
27+
run: tools/upload_buildomat_junit_to_trunk.sh $CHECK_RUN_ID
28+
env:
29+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
TRUNK_TOKEN: ${{ secrets.TRUNK_IO_TOKEN }}
31+
TRUNK_ORG_SLUG: oxide
32+
CHECK_RUN_ID: ${{ github.event_name == 'check_run' && github.event.check_run.id || github.event.inputs.check_run_id }}

0 commit comments

Comments
 (0)