Skip to content

Commit b522c67

Browse files
committed
wip 5/x
1 parent ded4ff7 commit b522c67

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

.github/workflows/dev.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,34 @@ jobs:
128128
run: scoop install main/[email protected] main/ninja
129129
- name: Build
130130
run: |
131-
& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
131+
& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
132132
cmake --preset=ci-windows -B build -DCMAKE_BUILD_TYPE=Debug .
133133
cmake --build build -j $env:MAKE_JOB_COUNT -v
134134
- name: Test
135135
run: |
136-
& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
136+
& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1' -arch ${{ matrix.arch }}
137137
.\build\test\tests.exe -r junit -o report.xml
138138
- name: Upload test report to Datadog
139139
run: |
140140
Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "datadog-ci.exe"
141141
./datadog-ci.exe junit upload --service dd-trace-cpp report.xml
142142
143+
coverage:
144+
needs: build-linux-cmake
145+
runs-on: ubuntu-22.04-arm
146+
container:
147+
image: datadog/docker-library:dd-trace-cpp-ci-91c12776-arm64
148+
steps:
149+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
150+
- run: bin/test --coverage --verbose
151+
- name: Report Datadog coverage
152+
run: |
153+
curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-arm64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
154+
datadog-ci coverage upload --service dd-trace-cpp .coverage/filtered.info
155+
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
156+
with:
157+
fail_ci_if_error: true
158+
file: .coverage/filtered.info
159+
upload_args: --disable-search
160+
token: ${{ secrets.CODECOV_TOKEN }}
161+
verbose: true

.github/workflows/main.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Development"
1+
name: "Main"
22
on:
33
workflow_dispatch:
44
push:
@@ -57,18 +57,3 @@ jobs:
5757
- name: Run Remote Configuration fuzzer
5858
run: ./.build/fuzz/remote-configuration/remote-config-fuzz -max_total_time=${DURATION_SEC}
5959

60-
coverage:
61-
needs: call-dev-workflow
62-
runs-on: ubuntu-22.04
63-
container:
64-
image: datadog/docker-library:dd-trace-cpp-ci
65-
steps:
66-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
67-
- run: bin/test --coverage --verbose
68-
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
69-
with:
70-
fail_ci_if_error: true
71-
file: .coverage/filtered.info
72-
upload_args: --disable-search
73-
token: ${{ secrets.CODECOV_TOKEN }}
74-
verbose: true

0 commit comments

Comments
 (0)