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

Target FTP forlder for release #757

Merged
merged 3 commits into from
May 8, 2024
Merged

Target FTP forlder for release #757

merged 3 commits into from
May 8, 2024

Conversation

rgaudin
Copy link
Member

@rgaudin rgaudin commented May 8, 2024

Fixes #756

@rgaudin
Copy link
Member Author

rgaudin commented May 8, 2024

Note that this only fixes the folder, not the filename. Awaiting @kelson42's input on that

BPerlakiH
BPerlakiH previously approved these changes May 8, 2024
Copy link
Collaborator

@BPerlakiH BPerlakiH left a comment

Choose a reason for hiding this comment

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

LGTM

@rgaudin
Copy link
Member Author

rgaudin commented May 8, 2024

I'll update filename as well

Comment on lines 217 to 219
mv ${PWD}/kiwix-${VERSION}.dmg ${PWD}/kiwix-desktop-macos_${VERSION}.dmg
python .github/upload_file.py --src ${PWD}/kiwix-${VERSION}.dmg --dest ci@master.download.kiwix.org:30022/data/download/${UPLOAD_FOLDER} --ssh-key ${SSH_KEY}
mv ${PWD}/kiwix-desktop-macos_${VERSION}.dmg ${PWD}/kiwix-${VERSION}.dmg
Copy link
Collaborator

@BPerlakiH BPerlakiH May 8, 2024

Choose a reason for hiding this comment

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

hmm I am not sure about this one...
we rename it, but the upload script still gets the kiwix-${VERSION}.dmg file as the --src input.
Maybe it would be enough to do:

Suggested change
mv ${PWD}/kiwix-${VERSION}.dmg ${PWD}/kiwix-desktop-macos_${VERSION}.dmg
python .github/upload_file.py --src ${PWD}/kiwix-${VERSION}.dmg --dest ci@master.download.kiwix.org:30022/data/download/${UPLOAD_FOLDER} --ssh-key ${SSH_KEY}
mv ${PWD}/kiwix-desktop-macos_${VERSION}.dmg ${PWD}/kiwix-${VERSION}.dmg
mv ${PWD}/kiwix-${VERSION}.dmg ${PWD}/kiwix-desktop-macos_${VERSION}.dmg
python .github/upload_file.py --src ${PWD}/kiwix-desktop-macos_${VERSION}.dmg --dest ci@master.download.kiwix.org:30022/data/download/${UPLOAD_FOLDER} --ssh-key ${SSH_KEY}

Copy link
Member Author

Choose a reason for hiding this comment

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

My bad ; fixed it. No we can't pass full destination as the script expects a folder.

Copy link
Collaborator

Choose a reason for hiding this comment

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

do we need the 2nd mv command after the upload ?

Copy link
Member Author

Choose a reason for hiding this comment

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

This filename is a requirement for this very step only. Changing expectations from this step onward seems unjustified. We dont need it because it's kind of the last step but it's cleaner IMO.

@rgaudin rgaudin requested a review from BPerlakiH May 8, 2024 09:22
Copy link
Collaborator

@BPerlakiH BPerlakiH left a comment

Choose a reason for hiding this comment

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

I think it needs a slight adjustment, as above.

@rgaudin
Copy link
Member Author

rgaudin commented May 8, 2024

I think it needs a slight adjustment, as above.

Which adjustment ?

@BPerlakiH
Copy link
Collaborator

BPerlakiH commented May 8, 2024

I think it needs a slight adjustment, as above.

Which adjustment ?

I think we were commenting on the same simultaneously.
Q: do we need to re-rename the file after the upload ?

@kelson42 kelson42 merged commit 809ff7b into main May 8, 2024
4 checks passed
@kelson42 kelson42 deleted the rlz-folder branch May 8, 2024 09:37
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.

Fix FTP target folder for macOS releases
3 participants