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

Move electron-builder config to javascript file #1402

Merged
merged 13 commits into from
Jan 3, 2024
Merged

Move electron-builder config to javascript file #1402

merged 13 commits into from
Jan 3, 2024

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jan 2, 2024 •
edited by github-actions bot
Loading

This change is marked as an internal change (Task), so will not be included in the changelog.

@t3chguy t3chguy added the T-Task Tasks for the team like planning label Jan 2, 2024
@t3chguy t3chguy self-assigned this Jan 2, 2024
t3chguy added 7 commits January 2, 2024 16:50
@t3chguy
Force update config-file-ts to work around electron-userland/electron…
5542486 
…-builder#7572

Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
Iterate
5b0c470 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
yarn.lock
715fab1 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
Fix resolutions
b6276d4 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
Merge branch 'develop' of https://github.com/vector-im/element-desktop …
8b4336c 
…into t3chguy/electron-builder.ts

# Conflicts:
#	yarn.lock
@t3chguy
Prettier
ccc8bea 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
yarn.lock
0033ddc 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy changed the title Move electron-builder config to typescript file Move electron-builder config to javascript file Jan 3, 2024
t3chguy added 4 commits January 3, 2024 10:24
@t3chguy
Use javascript for now
6e52022 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
DEBUG
283c60b 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
Undo debug
67167e6 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
Workaround
0dbc70e 
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy marked this pull request as ready for review January 3, 2024 15:08
@t3chguy t3chguy requested review from a team as code owners January 3, 2024 15:08
@t3chguy t3chguy requested review from dbkr and florianduros January 3, 2024 15:08
@t3chguy t3chguy merged commit 6617b29 into develop Jan 3, 2024
24 checks passed
@t3chguy t3chguy deleted the t3chguy/electron-builder.ts branch January 3, 2024 16:29
@t3chguy t3chguy mentioned this pull request Jan 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@florianduros florianduros florianduros approved these changes

@dbkr dbkr Awaiting requested review from dbkr dbkr is a code owner automatically assigned from element-hq/element-web-team

Assignees

@t3chguy t3chguy

Labels
T-Task Tasks for the team like planning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@t3chguy @florianduros