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

Chore: Remove dev branch #136

Merged
merged 3 commits into from
Jul 17, 2024
Merged

Chore: Remove dev branch #136

merged 3 commits into from
Jul 17, 2024

Conversation

Hugos68
Copy link
Collaborator

@Hugos68 Hugos68 commented Jul 9, 2024

This PR prepares for the removal of the dev branch as it serves no purpose. Changesets are already kept on a seperate branch until release and we're only fighting against it by having a seperate branch.

What this PR does:

  • Change baseBranch from "dev" to "main" in .changeset/config.json
  • Remove Merge main into dev after publish step from .github/workflows/release.yml
  • Remove "PR targets the dev branch (NEVER main branch)" from .github/pull_request_template.md

Copy link

vercel bot commented Jul 9, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
floating-ui-svelte ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 16, 2024 10:28pm

Copy link

changeset-bot bot commented Jul 9, 2024

⚠️ No Changeset found

Latest commit: f7d140f

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@Hugos68 Hugos68 self-assigned this Jul 9, 2024
@Hugos68 Hugos68 requested a review from AdrianGonz97 July 9, 2024 15:46
@Hugos68 Hugos68 added the administration Any administrative task label Jul 9, 2024
Copy link
Member

@AdrianGonz97 AdrianGonz97 left a comment

Choose a reason for hiding this comment

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

This LGTM! I took the liberty of simplifying the CI a bit more by using the packageManager field (pnpm/action-setup is able to install the correct version based on this field) as well as updated the contribution docs.

The last thing to do is to also change the default branch of this repo to main and we should be good to go!

@endigo9740
Copy link
Contributor

Thanks @AdrianGonz97

@Hugos68 let's coordinate on this tomorrow afternoon my time.

@Hugos68 Hugos68 merged commit f22d915 into main Jul 17, 2024
7 checks passed
@Hugos68 Hugos68 deleted the chore/remove-dev-branch branch July 17, 2024 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
administration Any administrative task
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants