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

[Fix]: scan-app-data conversion #35935

Merged
merged 1 commit into from
Jan 23, 2023
Merged

[Fix]: scan-app-data conversion #35935

merged 1 commit into from
Jan 23, 2023

Conversation

EWouters
Copy link
Contributor

@EWouters EWouters commented Jan 1, 2023 •
edited
Loading

Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.

See #34283 (comment)
and #35935 (comment).

Closes #34283.

Co-authored-by: Richard Steinmetz richard@steinmetz.cloud
Signed-off-by: EWouters 6179932+EWouters@users.noreply.github.com

Summary

Checklist

@szaimen szaimen added this to the Nextcloud 26 milestone Jan 1, 2023
@szaimen szaimen added the 3. to review Waiting for reviews label Jan 1, 2023
@szaimen szaimen requested review from ChristophWurst, a team, ArtificialOwl, icewind1991 and blizzz and removed request for a team January 1, 2023 21:28
@come-nc
Copy link
Contributor

come-nc commented Jan 2, 2023

Superseeded by #32059

@come-nc come-nc closed this Jan 2, 2023
@st3iny
Copy link
Member

st3iny commented Jan 2, 2023

Superseeded by #32059

No. This is about apps/files/lib/Command/ScanAppData.php. You linked the PR that fixed apps/files/lib/Command/Scan.php.

@st3iny st3iny reopened this Jan 2, 2023
@come-nc
Copy link
Contributor

come-nc commented Jan 2, 2023

Sorry about that

@EWouters
Copy link
Contributor Author

EWouters commented Jan 3, 2023 •
edited
Loading

Should I squash and force push or it it fine like this?

(I used only the browser and my phone for these changes 🤓 (and I tested them locally))

@st3iny
Copy link
Member

st3iny commented Jan 3, 2023

Should I squash and force push or it it fine like this?

(I used only the browser and my phone for these changes 🤓 (and I tested them locally))

Please squash your commits.

@EWouters @st3iny
[Fix]: scan-app-data conversion
3a9173c 
Adapted from sugestions by @Hiyoal in nextcloud#34283 and @st3iny in nextcloud#35935.

See nextcloud#34283 (comment)
and nextcloud#35935 (comment).

Closes nextcloud#34283.

Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
@EWouters
Copy link
Contributor Author

EWouters commented Jan 3, 2023 •
edited
Loading

Not sure if this is CI flakes:

From https://github.com/EWouters/server
 * branch                  patch-1    -> FETCH_HEAD
 * [new branch]            patch-1    -> pr/patch-1
warning: 9d07ec5a96d7995785f6d3d377024ba09977cb91:.gitmodules, multiple configurations found for 'submodule.3rdparty.path'. Skipping second one!
warning: 9d07ec5a96d7995785f6d3d377024ba09977cb91:.gitmodules, multiple configurations found for 'submodule.3rdparty.url'. Skipping second one!
Fetching submodule 3rdparty
fatal: remote error: upload-pack: not our ref 03c3817ff132653c794fd04410977952f69fd614
Errors during submodule fetch:
	3rdparty
Error: Process completed with exit code 1.

I can't change the name of the branch without opening a new PR, or is that not the problem?

Edit: Is CI perhaps not compatible with the Github CLI utility?

@st3iny
Copy link
Member

st3iny commented Jan 4, 2023 •
edited
Loading

I restarted failed tests. This might be a transient failure.

st3iny
st3iny approved these changes Jan 5, 2023
View reviewed changes
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

LGTM! Cypress failures are unrelated.

@st3iny
Copy link
Member

st3iny commented Jan 5, 2023

/backport to stable25

@st3iny
Copy link
Member

st3iny commented Jan 5, 2023

/backport to stable24

@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 12, 2023
@st3iny st3iny mentioned this pull request Jan 23, 2023
Closed
9 tasks
@st3iny st3iny requested a review from szaimen January 23, 2023 16:03
@st3iny st3iny requested a review from PVince81 January 23, 2023 16:03
@szaimen szaimen merged commit 078203a into nextcloud:master Jan 23, 2023
@welcome
Copy link

welcome bot commented Jan 23, 2023

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jan 23, 2023
Merged
backportbot-nextcloud bot pushed a commit that referenced this pull request Jan 23, 2023
@EWouters @st3iny @backportbot-nextcloud
[Fix]: scan-app-data conversion
66ccaa4 
Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.

See #34283 (comment)
and #35935 (comment).

Closes #34283.

Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
@szaimen
Copy link
Contributor

szaimen commented Jan 24, 2023

/backport to stable24

@st3iny st3iny mentioned this pull request Jan 24, 2023
Closed
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jan 24, 2023
Merged
backportbot-nextcloud bot pushed a commit that referenced this pull request Jan 24, 2023
@EWouters @st3iny @backportbot-nextcloud
[Fix]: scan-app-data conversion
75e2431 
Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.

See #34283 (comment)
and #35935 (comment).

Closes #34283.

Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
@bigbeka bigbeka mentioned this pull request Feb 23, 2023
Closed
@EWouters EWouters deleted the patch-1 branch March 3, 2023 17:30
@MahdiBaghbani MahdiBaghbani mentioned this pull request Apr 25, 2023
Draft
s8321414 pushed a commit to MODAODF/odfweb that referenced this pull request May 4, 2023
@EWouters @st3iny
[Fix]: scan-app-data conversion
4bc6b90 
Adapted from sugestions by @Hiyoal in #34283 and @st3iny in #35935.

See nextcloud/server#34283 (comment)
and nextcloud/server#35935 (comment).

Closes #34283.

Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: EWouters <6179932+EWouters@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hiyoal Hiyoal Hiyoal left review comments

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@st3iny st3iny st3iny approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl ArtificialOwl was automatically assigned from nextcloud/server-backend

@icewind1991 icewind1991 Awaiting requested review from icewind1991 icewind1991 was automatically assigned from nextcloud/server-backend

@blizzz blizzz Awaiting requested review from blizzz blizzz was automatically assigned from nextcloud/server-backend

@szaimen szaimen Awaiting requested review from szaimen

@PVince81 PVince81 Awaiting requested review from PVince81

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Milestone
Nextcloud 26
Development

Successfully merging this pull request may close these issues.

[Bug]: scan-app-data conversion
7 participants
@EWouters @come-nc @st3iny @szaimen @ChristophWurst @Hiyoal @skjnldsv