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

Remove bors.toml and update GitHub Actions #507

Merged
merged 1 commit into from
Jun 23, 2024

Conversation

mbrobbel
Copy link
Contributor

Another follow-up of #501.

Removes bors.toml, because it's no longer used/needed (it seems salsa is using a merge queue now). Also removes the empty rustfmt.toml.

Updates some GitHub Actions to the latest, removes the bors branch push triggers, and removes the use of the unmaintained actions-rs actions. Also bumps the mdbook versions to the latest and adds cacheing for the rust build jobs.

Copy link

netlify bot commented Jun 19, 2024

Deploy Preview for salsa-rs canceled.

Name Link
🔨 Latest commit 70976c2
🔍 Latest deploy log https://app.netlify.com/sites/salsa-rs/deploys/667341184fdaf50008fe26a4

Copy link
Contributor

@MichaReiser MichaReiser left a comment

Choose a reason for hiding this comment

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

Nice!

Comment on lines +41 to +50
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ steps.rust-toolchain.outputs.cachekey }}-${{ hashFiles('**/Cargo.toml') }}
restore-keys: |
${{ runner.os }}-cargo-${{ steps.rust-toolchain.outputs.cachekey }}-
${{ runner.os }}-cargo-
Copy link
Contributor

Choose a reason for hiding this comment

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

What's your experience for using github action's cache directly vs https://github.com/Swatinem/rust-cache. Or does this set up caching in addition to Swatinem because https://github.com/actions-rust-lang/setup-rust-toolchain enables caching by default.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm using a similar setup for other crates and it works fine to reduce job times. This is not in addition to anything else, this PR proposes to use https://github.com/dtolnay/rust-toolchain/.

Checking in a Cargo.lock file would make this more efficient.

Copy link
Member

Choose a reason for hiding this comment

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

I don't really have any opinion on these things. Happy to trust your judgment here.

Comment on lines +41 to +50
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ steps.rust-toolchain.outputs.cachekey }}-${{ hashFiles('**/Cargo.toml') }}
restore-keys: |
${{ runner.os }}-cargo-${{ steps.rust-toolchain.outputs.cachekey }}-
${{ runner.os }}-cargo-
Copy link
Member

Choose a reason for hiding this comment

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

I don't really have any opinion on these things. Happy to trust your judgment here.

@nikomatsakis nikomatsakis added this pull request to the merge queue Jun 23, 2024
Merged via the queue into salsa-rs:master with commit a1bf3a6 Jun 23, 2024
10 checks passed
@mbrobbel mbrobbel deleted the remove-bors-update-ci branch June 24, 2024 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants