Skip to content

Commit 98809ea

Browse files
Wumpfemilk
authored andcommitted
Execute PR-triggered cpp-upload only if there's no release label (#4806)
### What * (most likely) fixes #4805 It seems what happened on 0.12 is that we first executed the regular release build which uploaded the correct C++ artifact https://github.com/rerun-io/rerun/actions/runs/7464893722/job/20313070683 and THEN ran the regular PR ci which only uploads a linux artifact, overwriting the previous https://github.com/rerun-io/rerun/actions/runs/7464905304/job/20313103967 ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested the web demo (if applicable): * Using newly built examples: [app.rerun.io](https://app.rerun.io/pr/4806/index.html) * Using examples from latest `main` build: [app.rerun.io](https://app.rerun.io/pr/4806/index.html?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [app.rerun.io](https://app.rerun.io/pr/4806/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG - [PR Build Summary](https://build.rerun.io/pr/4806) - [Docs preview](https://rerun.io/preview/62c0913144e49334376cf643a71db16bac22d13d/docs) <!--DOCS-PREVIEW--> - [Examples preview](https://rerun.io/preview/62c0913144e49334376cf643a71db16bac22d13d/examples) <!--EXAMPLES-PREVIEW--> - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)
1 parent 6bf4d44 commit 98809ea

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/on_pull_request.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
build-rerun_c-and-upload:
8383
name: "Build & Upload rerun_c (Linux x64)"
84-
if: github.event.pull_request.head.repo.owner.login == 'rerun-io'
84+
if: github.event.pull_request.head.repo.owner.login == 'rerun-io' && !contains(github.event.pull_request.labels.*.name, 'release')
8585
uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
8686
with:
8787
CONCURRENCY: pr-${{ github.event.pull_request.number }}
@@ -90,7 +90,7 @@ jobs:
9090

9191
build-rerun-cli-and-upload:
9292
name: "Build & Upload rerun-cli (Linux x64)"
93-
if: github.event.pull_request.head.repo.owner.login == 'rerun-io'
93+
if: github.event.pull_request.head.repo.owner.login == 'rerun-io' && !contains(github.event.pull_request.labels.*.name, 'release')
9494
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
9595
with:
9696
CONCURRENCY: pr-${{ github.event.pull_request.number }}
@@ -99,6 +99,7 @@ jobs:
9999

100100
bundle-and-upload-rerun_cpp:
101101
name: "Bundle and upload rerun_cpp_sdk.zip"
102+
if: github.event.pull_request.head.repo.owner.login == 'rerun-io' && !contains(github.event.pull_request.labels.*.name, 'release')
102103
needs: [build-rerun_c-and-upload]
103104
uses: ./.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
104105
with:

.github/workflows/reusable_publish_rerun_c.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and publish wheels
1+
name: Build and publish C++ SDK
22

33
on:
44
workflow_call:

0 commit comments

Comments
 (0)