Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Fix nightly build #6833

Merged
merged 8 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
python3 scripts/ci/check_speculative_links.py
fi

# NOTE: When updating this job, also remember to update `post-release-version-bump`.
version:
name: "Versioning"
runs-on: ubuntu-latest
Expand Down Expand Up @@ -368,8 +369,11 @@ jobs:

gh pr comment $pr_number --body-file comment-body.txt

# Bump versions to next minor+alpha after the release has finished,
# so that the release PR can be merged.
post-release-version-bump:
name: "Post-Release Version Bump"
# We don't need to bump versions for `rc` releases, because we don't merge those.
if: inputs.release-type == 'alpha' || inputs.release-type == 'final'
needs:
[
Expand Down Expand Up @@ -398,20 +402,38 @@ jobs:
with:
pixi-version: v0.23.0

- name: Commit new version
- name: git config
run: |
# checkout + pull changes
git config --global user.name "rerun-bot"
git config --global user.email "bot@rerun.io"
git checkout ${{ github.ref_name }}
git pull --rebase

# bump version and commit it
- name: Update crate versions
id: crates
run: |
pixi run python scripts/ci/crates.py version --bump auto
pixi run toml-fmt
version="$(pixi run python scripts/ci/crates.py get-version)"
echo "version=$version" >> "$GITHUB_OUTPUT"

- name: Update rerun_notebook package version
run: |
pixi run python scripts/ci/update_rerun_notebook_version.py "${{ steps.crates.outputs.version }}"

- name: Update JS package versions
run: |
pixi run node rerun_js/scripts/version.mjs "${{ steps.crates.outputs.version }}"

git commit -am "Bump versions to $version"
- name: Update rerun_c version
# Configuring CMake is enough to change the version on rerun.h!
run: |
cmake -B build -S .

- run: pixi run toml-fmt

- name: Commit new version
run: |
git commit -am "Bump versions to ${{ steps.crates.outputs.version }}"
git push

comment-artifact-links:
Expand Down
878 changes: 439 additions & 439 deletions pixi.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rerun_cpp/src/rerun/c/rerun.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions rerun_js/scripts/version.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,18 @@ for (const pkg_path of root_package_json.workspaces) {
}
}

// update link to example rrd file in README
readme = readme.replace(
/<https:\/\/app\.rerun\.io\/.*\/examples\/dna\.rrd>/,
`<https://app.rerun.io/version/${version}/examples/dna.rrd>`,
);
// we use `+dev` as a marker for "this version is unreleased",
// which also means this link won't pass the link checker, so
// skip the RRD link version bump here in that case.
// this will be bumped only at the start of the release process,
// when the `+dev` is removed. at that point the new version will
// be uploaded, so the links will work, and this is safe to bump.
if (!version.includes("+dev")) {
readme = readme.replace(
/<https:\/\/app\.rerun\.io\/.*\/examples\/dna\.rrd>/,
`<https://app.rerun.io/version/${version}/examples/dna.rrd>`,
);
}

fs.writeFileSync(package_json_path, JSON.stringify(package_json, null, 2));
fs.writeFileSync(readme_path, readme);
Expand Down
4 changes: 2 additions & 2 deletions rerun_js/web-viewer-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rerun-io/web-viewer-react",
"version": "0.17.0",
"version": "0.18.0-alpha.1+dev",
"description": "Embed the Rerun web viewer in your React app",
"licenses": [
{
Expand Down Expand Up @@ -39,7 +39,7 @@
"tsconfig.json"
],
"dependencies": {
"@rerun-io/web-viewer": "0.17.0",
"@rerun-io/web-viewer": "0.18.0-alpha.1",
"@types/react": "^18.2.33",
"react": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion rerun_js/web-viewer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rerun-io/web-viewer",
"version": "0.17.0",
"version": "0.18.0-alpha.1+dev",
"description": "Embed the Rerun web viewer in your app",
"licenses": [
{
Expand Down
2 changes: 1 addition & 1 deletion rerun_notebook/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "hatchling.build"
[project]
name = "rerun-notebook"
description = "Implementation helper for running rerun-sdk in notebooks"
version = "0.17.0"
version = "0.18.0-alpha.1+dev"
dependencies = ["anywidget", "jupyter-ui-poll"]
readme = "README.md"
keywords = ["rerun", "notebook"]
Expand Down
2 changes: 1 addition & 1 deletion rerun_py/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ text = "MIT OR Apache-2.0"

[project.optional-dependencies]
tests = ["pytest==7.1.2"]
notebook = ["rerun-notebook==0.17.0"]
notebook = ["rerun-notebook==0.18.0-alpha.1+dev"]

[project.urls]
documentation = "https://www.rerun.io/docs"
Expand Down
Loading