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: bump web to v7.1.1 #7601

Merged
merged 1 commit into from
Oct 27, 2023
Merged

chore: bump web to v7.1.1 #7601

merged 1 commit into from
Oct 27, 2023

Conversation

JammingBen
Copy link
Contributor

Bumps Web to v7.1.1. This includes the following fixes:

@JammingBen JammingBen self-assigned this Oct 27, 2023
@JammingBen JammingBen requested a review from kulmann as a code owner October 27, 2023 06:58
Copy link
Member

@kulmann kulmann left a comment

Choose a reason for hiding this comment

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

We need to make sure to not delete the release-7.1.1 branch in web. So if you want to merge the version bump back to the stable-7.1 branch, you could either branch off from the release-7.1.1 branch or cherry-pick the commit. :-) If you want me to set up branch protection for the release-7.1.1 branch instead, please let me know

@micbar
Copy link
Contributor

micbar commented Oct 27, 2023

Thanks for spotting this @kulmann

Can we set the CI to stable-7.1 after merging back the release branch in web? I think that would reduce the maintenance overhead.

@JammingBen
Copy link
Contributor Author

Can we set the CI to stable-7.1 after merging back the release branch in web? I think that would reduce the maintenance overhead.

This is only used for CI anyway, right? Then I agree, we can continue to use stable-7.1 👍 It's a bunch of commits ahead of release-7.1.1, but nothing that should affect the CI.

@kulmann Hmm I'd prefer to cherry-pick the commit(s) to stable-7.1 instead of protecting another branch.

@JammingBen
Copy link
Contributor Author

@ScharfViktor Do you have an idea why https://drone.owncloud.com/owncloud/ocis/28187/38/12 is failing? It passes locally and in CI on Web branch stable-7.1, but it fails here.

@ScharfViktor
Copy link
Contributor

ScharfViktor commented Oct 27, 2023

@JammingBen did you port this PR to stable-branch? owncloud/web#9587

Screenshot 2023-10-27 at 13 32 15

test waits selected file like on screen:

Screenshot 2023-10-27 at 13 36 57

@JammingBen
Copy link
Contributor Author

owncloud/web#9587 is on stable7.1, yes. Does that need any adjustments regarding CI? If that's a problem we need to change the target branch to release-7.1.1 again and protect that one in the Web repository. I didn't think there would be any errors with using the latest commit @ stable7.1.

@JammingBen
Copy link
Contributor Author

It's a bunch of commits ahead of release-7.1.1, but nothing that should affect the CI.

Apparently that's not the case 🙈 So I reverted the target branch to release-7.1.1 again, just to see if the pipeline goes green. If so, we need to protect that branch in Web.

@ScharfViktor
Copy link
Contributor

owncloud/web#9587 is on stable7.1, yes.

there's something wrong with that because file openes direct on text editor. test expects another behavior

How reproduce:

  • switch web to stable-7.1
  • pnpm & pnpm build
  • go to ocis repo
  • enable web in ocis: WEB_ASSET_PATH=../web/dist/
  • start ocis: go run ocis/cmd/ocis/main.go server
  • run e2e test: BASE_URL_OCIS=localhost:9200 API_TOKEN=true pnpm test:e2e:cucumber tests/e2e/cucumber/features/smoke/link.feature:68

@sonarcloud
Copy link

sonarcloud bot commented Oct 27, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@JammingBen
Copy link
Contributor Author

It seems to work now, the target stable7.1 was too far ahead for the CI here.

@JammingBen
Copy link
Contributor Author

I also enabled protection for the release-7.1.1 branch, so we can merge this one here.

@JammingBen JammingBen merged commit f1f1bac into stable-4.0 Oct 27, 2023
1 check passed
@delete-merged-branch delete-merged-branch bot deleted the bump-web-to-7.1.1 branch October 27, 2023 14:18
ownclouders pushed a commit that referenced this pull request Oct 27, 2023
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.

4 participants