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

ci: use patches for shuttle/main on develop branch #154

Merged
merged 16 commits into from Mar 18, 2024
Merged

ci: use patches for shuttle/main on develop branch #154

merged 16 commits into from Mar 18, 2024

Conversation

sourabpramanik
Copy link
Contributor

@sourabpramanik sourabpramanik commented Mar 11, 2024 •
edited

Description of change

This PR adds a new GitHub workflow only for the develop branch.
Related issue: #1633

How has this been tested? (if applicable)

Approving the PR

jonaro00
jonaro00 reviewed Mar 11, 2024
View reviewed changes
Copy link
Member

@jonaro00 jonaro00 left a comment

Choose a reason for hiding this comment

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

Hmm, I also thought that we needed two files, but wouldn't it be better to check with github variables if we are on the devlop branch, and use that to conditionally trigger the steps where the checkout+patches happen? Then we can have one file.

.github/workflows/ci.dev.yml Outdated Show resolved Hide resolved
.github/workflows/ci.dev.yml Outdated Show resolved Hide resolved
.github/workflows/ci.dev.yml Outdated Show resolved Hide resolved
jonaro00
jonaro00 reviewed Mar 16, 2024
View reviewed changes
Copy link
Member

@jonaro00 jonaro00 left a comment

Choose a reason for hiding this comment

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

Looking good, but some things to fix:

.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
sourabpramanik and others added 2 commits March 16, 2024 21:31
@sourabpramanik @jonaro00
fix: update patch execution command
903a3f9 
Co-authored-by: jonaro00 <54029719+jonaro00@users.noreply.github.com>
@sourabpramanik @jonaro00
fix: optimize cloning
2945546 
Co-authored-by: jonaro00 <54029719+jonaro00@users.noreply.github.com>
jonaro00
jonaro00 reviewed Mar 16, 2024
View reviewed changes
.github/workflows/ci.yml Outdated Show resolved Hide resolved
.github/workflows/ci.yml Outdated Show resolved Hide resolved
jonaro00
jonaro00 approved these changes Mar 16, 2024
View reviewed changes
Copy link
Member

@jonaro00 jonaro00 left a comment

Choose a reason for hiding this comment

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

Even though the workflow is currently failing, the steps we want are working correctly now. It should work again when the 0.42.0 PR is merged in the main repo.

@jonaro00 jonaro00 changed the title Feat: new dev workflow ci: use patches for shuttle/main on develop branch Mar 16, 2024
@jonaro00 jonaro00 merged commit 8cc5f7b into shuttle-hq:develop Mar 18, 2024
1 of 3 checks passed
@sourabpramanik sourabpramanik deleted the feat/dev-ci-workflow branch March 18, 2024 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonaro00 jonaro00 jonaro00 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sourabpramanik @jonaro00