Skip to content

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.

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

Merged
merged 3 commits into from
Nov 28, 2024
Merged

use merge queue #1683

Show file tree
Hide file tree
Changes from 1 commit
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
25 changes: 25 additions & 0 deletions .github/workflows/doc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Docs

on:
push:
branches:
- master

jobs:
docs:
name: Publish Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Rust
run: rustup update nightly --no-self-update && rustup default nightly
- 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
15 changes: 1 addition & 14 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
pull_request:
branches:
- master
Copy link
Member Author

@marcoieni marcoieni Nov 27, 2024

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

@marcoieni marcoieni Nov 27, 2024

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

@marcoieni marcoieni Nov 27, 2024

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

@Amanieu Amanieu Nov 27, 2024

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

@marcoieni marcoieni Nov 27, 2024

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