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

Fixed build uploads #246

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Fixed build uploads #246

merged 1 commit into from
Apr 6, 2022

Conversation

rgaudin
Copy link
Member

@rgaudin rgaudin commented Apr 5, 2022

Changes the destination of uploads to master.download.kiwix.org on port 30022
As this service doesn't offer a shell anymore, converted the folder creation
and file renaming to more verbose, SFTP-based scripts.

@rgaudin rgaudin requested a review from Jaifroid April 5, 2022 08:59
@rgaudin rgaudin self-assigned this Apr 5, 2022
@Jaifroid
Copy link
Member

Jaifroid commented Apr 5, 2022

Thanks so much, @rgaudin. I wasn't expecting you to edit PowerShell scripts for me, but I've just tested this branch with the workflow dispatch, and it's working fine building nightly (see below). I'll resolve the conflict and then test a dummy release.

image

Copy link
Member

@Jaifroid Jaifroid left a comment

Choose a reason for hiding this comment

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

Excellent job, thank you!

@kelson42
Copy link
Contributor

kelson42 commented Apr 5, 2022

@rgaudin Can you rebase and merge please?

@kelson42
Copy link
Contributor

kelson42 commented Apr 5, 2022

I don't know for you, but the repository is huge (almost 3GB) and I can not rebase this branch because somehow the master branch is in an unusual state:

$ git reset --hard origin/master
HEAD is now at e45f1062 Fix version number rewriting to take account of SHA
$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   AppPackages/KiwixWebApp_0.0.0.0_Test/Add-AppDevPackage.ps1
	modified:   www/img/icons/wikimed-lightblue-64.ico

no changes added to commit (use "git add" and/or "git commit -a")

@rgaudin
Copy link
Member Author

rgaudin commented Apr 6, 2022

@kelson42 indeed the repo is very large and just pushing my changes was difficult 🙂
The repo is not in an unusal state though. It's just that those 2 files use windows line endings and your git config (default) rewrites them to unix line endings. It's a windows project after all 😉

@Jaifroid
Copy link
Member

Jaifroid commented Apr 6, 2022

@kelson42 @rgaudin I recently decided to try building the WikiMed and Wikivoyage apps on GitHub Actions, which involved pushing the ZIM archives (split into 50MB chunks) to their respective branches (this works very well, and the Electron versions of the custom apps build very fast on Actions and "upload" almost instantly to GitHub Releases, avoiding me having to use something like 5-6GB of my own bandwidth twice a month every time I release a new custom app for the multiple different platforms).

These chunks are not on master, and shouldn't have affected a PR based on master, depending on the checkout depth I guess. I intend to purge the respective branches before I push a new ZIM, so that I am not keeping a ridiculously large history of irrelevant changes.

I understand there is another solution using Large File Storage, which I could look into if Kiwix org has access to that.

@kelson42
Copy link
Contributor

kelson42 commented Apr 6, 2022

@Jaifroid ZIM files should be downloaded live by the build script, not being in the git. Kiwix Android custom does that way.

Changes the destination of uploads to master.download.kiwix.org on port 30022
As this service doesn't offer a shell anymore, converted the folder creation
and file renamings to more verbose, SFTP-based scripts.
---
@rgaudin rgaudin merged commit bdbe974 into master Apr 6, 2022
@rgaudin rgaudin deleted the ci-k8s branch April 6, 2022 11:01
@Jaifroid
Copy link
Member

Jaifroid commented Apr 6, 2022

Thanks once again, @rgaudin. @kelson42 I'll look into the solution you suggest.

@Jaifroid
Copy link
Member

Jaifroid commented Apr 6, 2022

I made a few adjustments not directly related to this PR to fix some issues with how/when Electron builder publishes the app versions. Nightly runs should now exit cleanly if there was no error. Due to my experiments there are lots of packages appearing in the 6th April nightly folder, but rest assured that cron jobs will only produce one of each package going forwards.

Jaifroid pushed a commit that referenced this pull request May 6, 2022
Fixed build uploads

Former-commit-id: bdbe974
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.

3 participants