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

meta: fix release process for beta branch #3809

Merged
merged 4 commits into from Jun 9, 2022

Conversation

aduh95
Copy link
Member

@aduh95 aduh95 commented Jun 2, 2022

We would first need to release a new version of 2.x to make sure everything's working as expected.

This PR fixes the bugs we add when releasing 3.0.0-beta, and also add a merge step to the release script so 3.x branch stays up-to-date with main.

I'm using fetch to get the latest version of the beta branch as that's not an info the GitHub API can give us, which means we need to use Node.js 18.x for running the release on the beta branch (or the NODE_OPTIONS=--experimental-fetch yarn release on Node.js 16.x).

@aduh95 aduh95 marked this pull request as ready for review June 7, 2022 19:02
@Murderlon
Copy link
Member

Shouldn't we always fix merge conflicts by hand? I feel like it's full of edge cases which might be hard to automate?

@aduh95
Copy link
Member Author

aduh95 commented Jun 8, 2022

Shouldn't we always fix merge conflicts by hand? I feel like it's full of edge cases which might be hard to automate?

I agree, that's why the release script asks the human to fix the conflicts: https://github.com/transloadit/uppy/pull/3809/files#diff-c1ecb0466d28ba177381f0f328b1cfdb7db2969ea12fd8fecedbc86c27ef029bR40-R47

The autoFixConflicts.mjs script may or may not be run to solve the conflicts, but it doesn't do it automatically – I guess I should find a better name for it...

@Murderlon
Copy link
Member

Personally I wouldn't have build this to always force a human to do a merge conflict. I'm afraid that sooner or later the script runs successfully but the wrong thing ended up in a release anyway.

@aduh95
Copy link
Member Author

aduh95 commented Jun 9, 2022

Personally I wouldn't have build this to always force a human to do a merge conflict.

What would you have done? Either a human or a script needs to fix the git conflicts, and it sounds like you are rejecting both 🤔

I'm afraid that sooner or later the script runs successfully but the wrong thing ended up in a release anyway.

Yeah I'm not too concerned about that, that's why we have a beta branch anyway: so we can screw up without much consequences ^^

Copy link
Member

@Murderlon Murderlon left a comment

Choose a reason for hiding this comment

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

Alright let's see how it does

@aduh95 aduh95 merged commit 2be8cec into transloadit:3.x Jun 9, 2022
@aduh95 aduh95 deleted the fix-release-process-for-3.x branch June 9, 2022 17:14
github-actions bot added a commit that referenced this pull request Jun 9, 2022
| Package                   |      Version | Package                   |      Version |
| ------------------------- | ------------ | ------------------------- | ------------ |
| uppy                      | 3.0.0-beta.1 | @uppy/google-drive        | 3.0.0-beta.1 |
| @uppy/audio               | 1.0.0-beta.1 | @uppy/informer            | 3.0.0-beta.1 |
| @uppy/box                 | 2.0.0-beta.1 | @uppy/instagram           | 3.0.0-beta.1 |
| @uppy/compressor          | 1.0.0-beta.1 | @uppy/locales             | 3.0.0-beta.1 |
| @uppy/drop-target         | 2.0.0-beta.1 | @uppy/onedrive            | 3.0.0-beta.1 |
| @uppy/image-editor        | 2.0.0-beta.1 | @uppy/progress-bar        | 3.0.0-beta.1 |
| @uppy/remote-sources      | 1.0.0-beta.1 | @uppy/provider-views      | 3.0.0-beta.1 |
| @uppy/svelte              | 2.0.0-beta.1 | @uppy/react               | 3.0.0-beta.1 |
| @uppy/vue                 | 1.0.0-beta.1 | @uppy/redux-dev-tools     | 3.0.0-beta.1 |
| @uppy/zoom                | 2.0.0-beta.1 | @uppy/robodog             | 3.0.0-beta.1 |
| @uppy/aws-s3              | 3.0.0-beta.1 | @uppy/screen-capture      | 3.0.0-beta.1 |
| @uppy/aws-s3-multipart    | 3.0.0-beta.1 | @uppy/status-bar          | 3.0.0-beta.1 |
| @uppy/companion-client    | 3.0.0-beta.1 | @uppy/store-default       | 3.0.0-beta.1 |
| @uppy/core                | 3.0.0-beta.1 | @uppy/store-redux         | 3.0.0-beta.1 |
| @uppy/dashboard           | 3.0.0-beta.1 | @uppy/thumbnail-generator | 3.0.0-beta.1 |
| @uppy/drag-drop           | 3.0.0-beta.1 | @uppy/transloadit         | 3.0.0-beta.1 |
| @uppy/dropbox             | 3.0.0-beta.1 | @uppy/tus                 | 3.0.0-beta.1 |
| @uppy/facebook            | 3.0.0-beta.1 | @uppy/unsplash            | 3.0.0-beta.1 |
| @uppy/file-input          | 3.0.0-beta.1 | @uppy/url                 | 3.0.0-beta.1 |
| @uppy/form                | 3.0.0-beta.1 | @uppy/webcam              | 3.0.0-beta.1 |
| @uppy/golden-retriever    | 3.0.0-beta.1 | @uppy/xhr-upload          | 3.0.0-beta.1 |

- meta: improve release process for beta branch (Antoine du Hamel / #3809)
- uppy: refactor to ESM (Antoine du Hamel / #3807)
- @uppy/core,@uppy/dashboard: fix types for some events (Antoine du Hamel / #3812)
- example: update Vue2 example (Antoine du Hamel / #3802)
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

2 participants