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

fix(CI): fix msrv checks on github run on push to main #1645

Merged
merged 5 commits into from
Jul 10, 2023

Conversation

ShankarSinghC
Copy link
Contributor

Type of Change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates
  • Documentation
  • CI/CD

Description

This PR introduces changes to improve the CI workflow in the repository. The main goal is to separate the logic for pushes to the main branch from pull requests.

  1. Created a new workflow file, CI-push.yml, specifically for pushes to the main branch.
  2. Modified the existing CI.yml file to trigger only on pull requests.
  3. Removed the logic that checked for differences in crates in the CI-push.yml file.
    The logic we had in place for checking differences in crates in a pull request is not valid when we push directly to the main branch.

The CI-push.yml file contains a single job, push-to-main, which runs on Ubuntu latest and performs the following steps:

  • Checks out the repository.
  • Installs Rust and cargo-hack.
  • Executes the cargo hack check command to check all workspace packages without considering specific differences.

By separating the workflows, we can now ensure that CI builds on the main branch do not fail due to the logic designed for PRs. The CI-push.yml workflow specifically targets pushes to the main branch and performs the necessary cargo-hack checks on all workspace packages.

Additional Changes

  • This PR modifies the API contract
  • This PR modifies the database schema
  • This PR modifies application configuration/environment variables

Motivation and Context

How did you test it?

Checklist

  • I formatted the code cargo +nightly fmt --all
  • I addressed lints thrown by cargo clippy
  • I reviewed submitted code
  • I added unit tests for my changes where possible
  • I added a CHANGELOG entry if applicable

@ShankarSinghC ShankarSinghC added A-CI-CD Area: Continuous Integration/Deployment C-bug Category: Bug R-waiting-on-L1 Review: Waiting on L1 reviewer labels Jul 7, 2023
@ShankarSinghC ShankarSinghC requested a review from a team as a code owner July 7, 2023 09:23
@ShankarSinghC ShankarSinghC self-assigned this Jul 7, 2023
.github/workflows/CI-pr.yml Outdated Show resolved Hide resolved
.github/workflows/CI-pr.yml Outdated Show resolved Hide resolved
.github/workflows/CI-pr.yml Outdated Show resolved Hide resolved
@SanchithHegde SanchithHegde added S-waiting-on-author Status: This PR is incomplete or needs to address review comments and removed R-waiting-on-L1 Review: Waiting on L1 reviewer labels Jul 7, 2023
@SanchithHegde SanchithHegde added S-waiting-on-review Status: This PR has been implemented and needs to be reviewed and removed S-waiting-on-author Status: This PR is incomplete or needs to address review comments labels Jul 7, 2023
@SanchithHegde SanchithHegde added this pull request to the merge queue Jul 10, 2023
Merged via the queue into main with commit 05ea08b Jul 10, 2023
@SanchithHegde SanchithHegde deleted the fix_msrv_checks branch July 10, 2023 10:12
@SanchithHegde SanchithHegde removed the S-waiting-on-review Status: This PR has been implemented and needs to be reviewed label Jul 10, 2023
@lsampras
Copy link
Member

@ShankarSinghC Can we also move merge_group trigger to CI-push.yaml

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-CI-CD Area: Continuous Integration/Deployment C-bug Category: Bug
Projects
No open projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

3 participants