Skip to content

Commit

Permalink
Jan/full check 12 (rerun-io#5961)
Browse files Browse the repository at this point in the history
<!--
Open the PR up as a draft until you feel it is ready for a proper
review.

Do not make PR:s from your own `main` branch, as that makes it difficult
for reviewers to add their own fixes.

Add any improvements to the branch as new commits to make it easier for
reviewers to follow the progress. All commits will be squashed to a
single commit once the PR is merged into `main`.

Make sure you mention any issues that this PR closes in the description,
as well as any other related issues.

To get an auto-generated PR description you can put "copilot:summary" or
"copilot:walkthrough" anywhere.
-->

### What

Set job concurrency to something other than what's used on `main`, and
compare against `null` in run id fetch loop

### Checklist
* [ ] 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)
* [ ] I've included a screenshot or gif (if applicable)
* [ ] I have tested the web demo (if applicable):
* Using examples from latest `main` build:
[rerun.io/viewer](https://rerun.io/viewer/pr/{{pr.number}}?manifest_url=https://app.rerun.io/version/main/examples_manifest.json)
* Using full set of examples from `nightly` build:
[rerun.io/viewer](https://rerun.io/viewer/pr/{{pr.number}}?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json)
* [ ] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG
* [ ] If applicable, add a new check to the [release
checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)!

- [PR Build Summary](https://build.rerun.io/pr/{{ pr.number }})
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)

To run all checks from `main`, comment on the PR with `@rerun-bot
full-check`.
  • Loading branch information
jprochazk authored Apr 12, 2024
1 parent 5ca2b85 commit 9f3c45d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/on_pr_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,14 @@ jobs:
dispatch_workflow () {
local workflow_name=$1
local ref_name=$2
local inputs=$3
# https://cli.github.com/manual/gh_workflow_run
gh workflow run $workflow_name --ref "refs/heads/$ref_name"
echo $inputs | gh workflow run $workflow_name --ref "refs/heads/$ref_name"
}
workflow_name='on_push_main.yml'
ref_name=$(gh pr view ${{ github.event.issue.number }} --json headRefName | jq -r '.headRefName')
inputs='{"CONCURRENCY": "pr-${{ github.event.issue.number }}-full-check"}'
now=$(date --utc --iso-8601=seconds)
echo "Dispatching workflow $workflow_name on branch $ref_name"
Expand All @@ -84,7 +86,7 @@ jobs:
run_info=$(get_latest_workflow_run $workflow_name $ref_name $now)
echo $run_info
run_id=$(echo $run_info | jq -r '.[0].databaseId')
while [ -z $run_id ]
while [ $run_id == 'null' ]
do
run_info=$(get_latest_workflow_run $workflow_name $ref_name $now)
echo $run_info
Expand Down
32 changes: 18 additions & 14 deletions .github/workflows/on_push_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,48 @@ on:
# Can be triggered manually from within the UI or using the GH CLI,
# e.g. `gh workflow run on_push_main.yml --ref main`
workflow_dispatch:
inputs:
CONCURRENCY:
required: true
type: string

jobs:
checks:
name: Checks
uses: ./.github/workflows/reusable_checks.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
secrets: inherit

cpp_checks:
name: Checks
uses: ./.github/workflows/reusable_checks_cpp.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
FULL: "true"
secrets: inherit

rust_checks:
name: Checks
uses: ./.github/workflows/reusable_checks_rust.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
CHANNEL: main
secrets: inherit

python_checks:
name: Checks
uses: ./.github/workflows/reusable_checks_python.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
secrets: inherit

deploy-docs:
needs: [checks]
name: Deploy Docs
uses: ./.github/workflows/reusable_deploy_docs.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
PY_DOCS_VERSION_NAME: "main"
CPP_DOCS_VERSION_NAME: "main"
RS_DOCS_VERSION_NAME: "head"
Expand All @@ -56,7 +60,7 @@ jobs:
name: "Build web viewer"
uses: ./.github/workflows/reusable_build_web.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
CHANNEL: main
secrets: inherit

Expand All @@ -65,15 +69,15 @@ jobs:
needs: [build-web]
uses: ./.github/workflows/reusable_upload_web.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
secrets: inherit

build-examples:
name: "Build Examples"
needs: [build-wheel-linux-x64]
uses: ./.github/workflows/reusable_build_examples.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
CHANNEL: main
WHEEL_ARTIFACT_NAME: linux-x64-wheel
secrets: inherit
Expand All @@ -83,7 +87,7 @@ jobs:
needs: [build-web, build-examples]
uses: ./.github/workflows/reusable_track_size.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
WITH_EXAMPLES: true
secrets: inherit

Expand All @@ -92,7 +96,7 @@ jobs:
needs: [build-examples]
uses: ./.github/workflows/reusable_upload_examples.yml
with:
CONCURRENCY: push-${{ github.ref_name }}
CONCURRENCY: push-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
secrets: inherit

# -----------------------------------------------------------------------------------
Expand All @@ -103,7 +107,7 @@ jobs:
name: "Linux-x64: Build & Upload rerun_c"
uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
with:
CONCURRENCY: push-linux-x64-${{ github.ref_name }}
CONCURRENCY: push-linux-x64-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
PLATFORM: linux-x64
secrets: inherit

Expand All @@ -115,7 +119,7 @@ jobs:
name: "Linux-x64: Build & Upload rerun-cli"
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
with:
CONCURRENCY: push-linux-x64-${{ github.ref_name }}
CONCURRENCY: push-linux-x64-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
PLATFORM: linux-x64
secrets: inherit

Expand All @@ -127,7 +131,7 @@ jobs:
name: "Linux-x64: Build & Upload Wheels"
uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
with:
CONCURRENCY: push-linux-x64-${{ github.ref_name }}
CONCURRENCY: push-linux-x64-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
PLATFORM: linux-x64
WHEEL_ARTIFACT_NAME: linux-x64-wheel
MODE: "pypi"
Expand All @@ -138,7 +142,7 @@ jobs:
name: "Linux-x64: Test Wheels"
uses: ./.github/workflows/reusable_test_wheels.yml
with:
CONCURRENCY: push-linux-x64-${{ github.ref_name }}
CONCURRENCY: push-linux-x64-${{ github.ref_name }}-${{ inputs.CONCURRENCY }}
PLATFORM: linux-x64
WHEEL_ARTIFACT_NAME: linux-x64-wheel
secrets: inherit

0 comments on commit 9f3c45d

Please sign in to comment.