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.

Sign up for GitHub

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

Jump to bottom

use merge queue #1683

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −22
Open

use merge queue #1683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3ead43
use merge queue
MarcoIeni Nov 27, 2024
5e21410
add conclusion job
MarcoIeni Nov 27, 2024
b200c7c
remove docs publishing
MarcoIeni Nov 27, 2024
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
37 changes: 15 additions & 22 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: CI
on:
push:
branches:
- auto
- try
MarcoIeni marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
branches:
- master
Copy link
Member Author

Choose a reason for hiding this comment

The 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:
Expand All @@ -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'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the if, and moved the Publish step to the doc.yml.

I kept the rest of the job here so that we know in advance if the job fail 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, was the if every triggered? I'm asking since the on condition looks like this:

push:
    branches:
    - auto
    - try

Copy link
Member

Choose a reason for hiding this comment

The 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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feel free to push the change 👍

Copy link
Member Author

@MarcoIeni MarcoIeni Nov 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The 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
Expand Down Expand Up @@ -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) }}'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copy pasted the same check we added in other repos
https://github.com/rust-lang/rust-clippy/blob/8bc1a9e49a22b0e43c942102b13ded8704851228/.github/workflows/clippy_pr.yml#L62