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

feat(1.84.2): fix patch #1715

Merged
merged 1 commit into from
Nov 10, 2023
Merged

feat(1.84.2): fix patch #1715

merged 1 commit into from
Nov 10, 2023

Conversation

daiyam
Copy link
Member

@daiyam daiyam commented Nov 10, 2023

No description provided.

@daiyam daiyam merged commit fbeaf45 into VSCodium:master Nov 10, 2023
14 checks passed
@daiyam daiyam deleted the feat-1842 branch November 10, 2023 13:24
@Brli
Copy link

Brli commented Nov 14, 2023

when doing ./prepare_vscode.sh under linux
it returns

applying patch: ../patches/binary-name.patch
applying patch: ../patches/brand.patch
error: patch failed: src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts:184
error: src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts: patch does not apply
failed to apply patch ../patches/brand.patch

the commit used is the release tag of 1.84.2.23317

there is no issue at 1.84.1.23311

@daiyam
Copy link
Member Author

daiyam commented Nov 14, 2023

It's due to this issue microsoft/vscode#197976

I'm thinking to the same as https://github.com/VSCodium/vscodium/blob/master/insider.json for for the stable branch.

@Brli
Copy link

Brli commented Nov 14, 2023

So, the suggestion would be to use a newer commit of vscode instead of the tagged one?

@daiyam
Copy link
Member Author

daiyam commented Nov 14, 2023

@Brli No, a stable.json would contains the correct commit id instead of looking at the tag to get the commit id (the current tag currently points to an older version).

@daiyam
Copy link
Member Author

daiyam commented Nov 14, 2023

If by the end of the day, the tag isn't fixed then I will add the stable.json.

But it seems that something is screwed at GitHub since the tag is correct on some systems.

@daiyam
Copy link
Member Author

daiyam commented Nov 15, 2023

stable.json should be out soon #1728

@daiyam
Copy link
Member Author

daiyam commented Nov 15, 2023

The new version is out with https://github.com/VSCodium/vscodium/blob/master/stable.json

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants