-
Notifications
You must be signed in to change notification settings - Fork 304
use merge queue #1683
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
use merge queue #1683
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,7 @@ | ||
| name: CI | ||
| on: | ||
| push: | ||
| branches: | ||
| - auto | ||
| - try | ||
| pull_request: | ||
| branches: | ||
| - master | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. oh, I removed this filter, feel free to re-add it |
||
| merge_group: | ||
|
|
||
| jobs: | ||
| style: | ||
|
|
@@ -29,14 +24,6 @@ jobs: | |
| - run: ci/dox.sh | ||
| env: | ||
| CI: 1 | ||
| - name: Publish documentation | ||
| run: | | ||
| cd target/doc | ||
| git init | ||
| git add . | ||
| git -c user.name='ci' -c user.email='ci' commit -m init | ||
| git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages | ||
| if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I removed the if, and moved the Publish step to the I kept the rest of the job here so that we know in advance if the job fail 👍
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. btw, was the
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually I think can just drop the docs publishing. They've been included in the standard library for ages.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. feel free to push the change 👍
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually I just removed the file 👍 I guess you still need to check if the docs are correct, so I kept the previous steps 👍 |
||
|
|
||
| verify: | ||
| name: Automatic intrinsic verification | ||
|
|
@@ -246,19 +233,25 @@ jobs: | |
| run: rustup update nightly && rustup default nightly | ||
| - run: ./ci/build-std-detect.sh | ||
|
|
||
| success: | ||
| conclusion: | ||
| needs: | ||
| - docs | ||
| - verify | ||
| - env_override | ||
| - test | ||
| - build-std-detect | ||
| runs-on: ubuntu-latest | ||
| # GitHub branch protection is exceedingly silly and treats "jobs skipped because a dependency | ||
| # failed" as success. So we have to do some contortions to ensure the job fails if any of its | ||
| # dependencies fails. | ||
| if: always() # make sure this is never "skipped" | ||
| # We need to ensure this job does *not* get skipped if its dependencies fail, | ||
| # because a skipped job is considered a success by GitHub. So we have to | ||
| # overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run | ||
| # when the workflow is canceled manually. | ||
| # | ||
| # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB! | ||
| if: ${{ !cancelled() }} # make sure this is never "skipped" | ||
| steps: | ||
| # Manually check the status of all dependencies. `if: failure()` does not work. | ||
| - name: check if any dependency failed | ||
| run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}' | ||
| - name: Conclusion | ||
| run: | | ||
| # Print the dependent jobs to see them in the CI log | ||
| jq -C <<< '${{ toJson(needs) }}' | ||
| # Check if all jobs that we depend on (in the needs array) were successful. | ||
| jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}' | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. copy pasted the same check we added in other repos |
||
Uh oh!
There was an error while loading. Please reload this page.