Skip to content

switch Linux build over to use configured docker image#898

Merged
shiftkey merged 11 commits intolinuxfrom
tweak-ci-to-use-docker
Jul 9, 2023
Merged

switch Linux build over to use configured docker image#898
shiftkey merged 11 commits intolinuxfrom
tweak-ci-to-use-docker

Conversation

@shiftkey
Copy link
Owner

@shiftkey shiftkey commented Jul 9, 2023

Description

Extracting out from #897 to just focus on shifting the Linux builds over to using Docker (with an earlier version of Ubuntu and a different node that supports an older glibc).

shiftkey and others added 3 commits July 9, 2023 16:22
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
…s GLIBC 17

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
@theofficialgman
Copy link

theofficialgman commented Jul 9, 2023

not sure if you intend on fixing all the cross compilation issues in this PR but you are missingthe dist-info.ts and build.ts script changes
https://github.com/shiftkey/desktop/pull/897/files#diff-bedccfa88bfc1b5eb66ff5bb37b320e3bbf3819f61b10b95c00ee58f0da58baf
https://github.com/shiftkey/desktop/pull/897/files#diff-8f5152cdb50c1fff0034a810c976a72398933e3e4680f3fb52a3e60bb27e172f

implement however you want as long as the function is the same. your changes here are a nice cleanup, I hadn't thought of that (was just following the previous work) aff1c2b

@shiftkey
Copy link
Owner Author

shiftkey commented Jul 9, 2023

@theofficialgman 👍🏻 about to push that fix now

script/build.ts Outdated
Comment on lines 147 to 143

Choose a reason for hiding this comment

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

can't comment high enough. look up a few lines, in the file I refererenced to you. you need to change

 if (
      targetArch === 'arm64' ||
      targetArch === 'x64' ||
      targetArch === 'armv7l'
    ) {
      return targetArch
    }

its input is npm_config_arch and armv7l isn't valid input. arm is but the returned value needs to be armv7l (for electron packager)

Choose a reason for hiding this comment

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

actually nvm. the functionality as it is will work, it will just be impossible to hit targetArch === 'armv7l' since npm_config_arch should never contain that and os.arch will never return that

@shiftkey shiftkey force-pushed the tweak-ci-to-use-docker branch from 6e47e94 to ff301ac Compare July 9, 2023 20:48
@shiftkey shiftkey marked this pull request as ready for review July 9, 2023 21:08
@theofficialgman
Copy link

theofficialgman commented Jul 9, 2023

also just an fyi, I can't mark any of these reviews as resolved. only you (the repo owner or the PR owner, in this case you are both) can do that

@shiftkey shiftkey force-pushed the tweak-ci-to-use-docker branch from 24d23dc to 47e1aa6 Compare July 9, 2023 21:36
@shiftkey shiftkey merged commit 11b3871 into linux Jul 9, 2023
@shiftkey shiftkey deleted the tweak-ci-to-use-docker branch July 9, 2023 21:54
shiftkey added a commit that referenced this pull request Jul 13, 2023
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Jul 22, 2023
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Jul 27, 2023
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
… architectures (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Feb 9, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
… architectures (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
… architectures (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
… architectures (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
shiftkey added a commit that referenced this pull request Mar 2, 2025
…res (#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
theofficialgman added a commit to theofficialgman/desktop that referenced this pull request Oct 7, 2025
…ftkey#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
theofficialgman added a commit to theofficialgman/desktop that referenced this pull request Oct 7, 2025
… architectures (shiftkey#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
theofficialgman added a commit to theofficialgman/desktop that referenced this pull request Oct 7, 2025
…res (shiftkey#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
theofficialgman added a commit to theofficialgman/desktop that referenced this pull request Oct 7, 2025
…res (shiftkey#898)

Co-authored-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
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