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

Revert trunk branch versions to 1.0.0-rc3 (no hotfix) #223

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

bfops
Copy link
Collaborator

@bfops bfops commented Jan 27, 2025

Description of Changes

Remove the -hotfix* part of the version in our trunk branch.

It was a (my) mistake to merge a -hotfix* version change. Hotfixes are, by definition, cherry-picked changes that are going to be released directly to users without merging.

The consequence of merging this change was that the SDK Tests CI job started failing on SpacetimeDB PRs (e.g. see failures on clockworklabs/SpacetimeDB#2137), because it checks out this repo, which then tried to use the -hotifx3 version of SpacetimeDB. But the master branch of SpacetimeDB is at 1.0.0-rc3 (no hotfix), because the hotfix was correctly released from a branch without merging in that repo.

Although this PR reverts the version change, we do still have a tag v1.0.0-rc3-hotfix3 that we can use to release the hotfix version (by git push -f origin v1.0.0-rc3-hotfix3:master) if/when desired.

API

  • This is an API breaking change to the SDK

No

Requires SpacetimeDB PRs

Should work with master.

Testsuite

If you would like to run the your SDK changes in this PR against a specific SpacetimeDB branch, specify that here. This can be a branch name or a link to a PR.

SpacetimeDB branch name: master

Testing

I claim that the CI tests passing with master show that this is correct. The original version change itself passed CI because it was pointing at a non-master branch for testing. I claim it would have failed if it were tested against SpacetimeDB master.

Generally, this might point to a bug in how we've done this CI: We should probably only allow a PR to merge in this repo if it tests successfully against SpacetimeDB master, even if we want to point it at other branches to test in the meantime.

@bfops bfops requested a review from cloutiertyler January 27, 2025 17:48
@bfops bfops changed the title Revert trunk branch versions to 1.0.0-rc3 (no hotfix) Revert trunk branch versions to 1.0.0-rc3 (no hotfix) Jan 27, 2025
Copy link
Collaborator

@cloutiertyler cloutiertyler left a comment

Choose a reason for hiding this comment

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

I have groked your description and agree. Approving.

@bfops bfops merged commit 4434050 into staging Jan 27, 2025
8 checks passed
@bfops bfops deleted the bfops/revert-staging-version branch January 27, 2025 18:22
@bfops bfops mentioned this pull request Jan 27, 2025
1 task
bfops added a commit that referenced this pull request Jan 27, 2025
## Description of Changes
Revert DLLs, which I should have done in
#223.

See that PR for background on why it was necessary.

## API

 - [ ] This is an API breaking change to the SDK

Kinda, but it's a revert.

## Requires SpacetimeDB PRs
*List any PRs here that are required for this SDK change to work*

## Testsuite
SpacetimeDB branch name: master

## Testing
I would have liked to say that the current CI is sufficient as I did in
the last PR, but now I no longer feel confident.. Currently the repo is
in a somewhat inconsistent state, though, so I think we should merge
this right now as it will not make it _less_ consistent.

I'm very open to suggestions about how to test this properly.

Co-authored-by: Zeke Foppa <[email protected]>
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.

2 participants