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

Update to 2.3.3 #17

Merged
merged 15 commits into from Aug 19, 2021
Merged

Update to 2.3.3 #17

merged 15 commits into from Aug 19, 2021

Conversation

catsout
Copy link
Collaborator

@catsout catsout commented Aug 16, 2021

No description provided.

@flathubbot
Copy link

Started test build 56360

@flathubbot
Copy link

Build 56360 failed

@catsout
Copy link
Collaborator Author

catsout commented Aug 16, 2021

bot, build net.cozic.joplin_desktop

@flathubbot
Copy link

Queued test build for net.cozic.joplin_desktop.

@flathubbot
Copy link

Started test build 56388

@flathubbot
Copy link

Build 56388 was cancelled

@flathubbot
Copy link

Started test build 56390

@catsout
Copy link
Collaborator Author

catsout commented Aug 17, 2021

@nedrichards
The flathub bot will stuck at downloading sources.

@flathubbot
Copy link

Build 56390 failed

@flathubbot
Copy link

Started test build 56416

@catsout
Copy link
Collaborator Author

catsout commented Aug 17, 2021

@barthalion
The flathub bot will stuck at downloading sources.

@flathubbot
Copy link

Build 56416 failed

@tinywrkb
Copy link
Contributor

@catsout

Try adding sed -i 's#git+ssh://git@#https://#' generated-sources.json to the workflow.

@flathubbot
Copy link

Started test build 56533

@flathubbot
Copy link

Build 56533 failed

@flathubbot
Copy link

Started test build 56536

@flathubbot
Copy link

Build 56536 was cancelled

@flathubbot
Copy link

Started test build 56538

@flathubbot
Copy link

Build 56538 failed

@tinywrkb
Copy link
Contributor

Post the Replace 'git+ssh' to http commit and with the following the build is failing in a bit later while running git ls-remote -h -t due to the fact network is not available.

diff --git a/net.cozic.joplin_desktop.yml b/net.cozic.joplin_desktop.yml
index f1315ef..74c0fef 100644
--- a/net.cozic.joplin_desktop.yml
+++ b/net.cozic.joplin_desktop.yml
@@ -61,6 +61,7 @@ modules:
         npm_config_no_save: 'true'
         npm_config_loglevel: silly
     build-commands:
+      - sed -i 's#git+ssh://git@\(github.com/laurent22\)#git://\1#' packages/{app-cli,lib,renderer}/package-lock.json
       - npm install
       # generateSha512.js require appimage build, need touch it
       # If no it will cause electron-builder failed without error message even set debug!

I don't know if there's a way to disable the git ls-remote, so upstream might need to switch to a tarball source instead of git.
The alternative is to regenerate the package-lock.json during the auto-update workflow, add them here to the repo, and copy over the upstream's ones before running npm install when building the package.

Another reason why upstream should consider switching to tarballs instead of git is this issue.

/ping @laurent22

@flathubbot
Copy link

Started test build 56540

@flathubbot
Copy link

Started test build 56541

@flathubbot
Copy link

Build 56540 was cancelled

@flathubbot
Copy link

Build 56541 was cancelled

@laurent22
Copy link
Collaborator

@tinywrkb, I'm not familiar with these problems. What's causing an issue in Joplin repo?

@catsout
Copy link
Collaborator Author

catsout commented Aug 18, 2021

Post the Replace 'git+ssh' to http commit and with the following the build is failing in a bit later while running git ls-remote -h -t due to the fact network is not available.

npm find a package with git url:https://github.com, but there is no network.
The flatpak-builder-tools will create some script to replace this git url to local git+file:// url
But seems the npm change it's behavior, which make the script do not replace the git url
Need to write extra code on my fork of flatpak-builder-tools

@flathubbot
Copy link

Started test build 56542

@flathubbot
Copy link

Build 56542 failed

@catsout
Copy link
Collaborator Author

catsout commented Aug 18, 2021

WARN read-shrinkwrap This version of npm is compatible with lockfileVersion@1, but package-lock.json was generated for lockfileVersion@2. I'll try to do my best with it!

@flathubbot
Copy link

Started test build 56545

@flathubbot
Copy link

Build 56545 failed

@tinywrkb
Copy link
Contributor

@laurent22 as @catsout pointed out, there are some difficulties of building in offline mode when there are node modules with git sources. To work around them, some changes are needed to be made to the Flatpak packaging helpers, flatpak-builder-tools.
These issues could be avoided if only tarball sources were used, at least for tagged releases, though it's better to fix flatpak-builder-tools.

@catsout
Copy link
Collaborator Author

catsout commented Aug 18, 2021

@tinywrkb
I think the git source has been fixed by a1dcedb
The build now failed with fs-extra, which may caused by the new lockfile version.Need more test to find why npm requires to fetch fresh package.

@flathubbot
Copy link

Started test build 56598

@catsout
Copy link
Collaborator Author

catsout commented Aug 18, 2021

Seems like it's the same issue as laurent22/joplin#4478
Just patch to same version.

@flathubbot
Copy link

Build 56598 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/54524/net.cozic.joplin_desktop.flatpakref

@catsout catsout merged commit 99c2127 into master Aug 19, 2021
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.

None yet

4 participants