Skip to content

Update release/nightly uploads for new destination #105

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

Merged
rgaudin merged 1 commit into from
May 6, 2026
Merged

Update release/nightly uploads for new destination #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build_libzim_wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ env:
DISPATCH_TYPE: ${{ github.event.inputs.buildtype }}
LIBZIM_VERSION: ${{ github.event.inputs.libzim_version }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SSH_KEY: ${{ secrets.SSH_KEY }}
UPLOAD_SSH_KEY: ${{ secrets.JAVASCRIPTLIBZIM_FILE_UPLOAD_KEY }}
BUILD_TYPE: ${{ github.event.inputs.buildtype }}

jobs:
Expand Down Expand Up @@ -124,14 +124,14 @@ jobs:
- name: Zip the artefacts and upload to nightly
if: github.event.schedule || github.event.inputs.buildtype == 'nightly'
run: |
echo "$SSH_KEY" > ./scripts/ssh_key
chmod 600 ./scripts/ssh_key
echo "$UPLOAD_SSH_KEY" > ./scripts/upload_ssh_key
chmod 600 ./scripts/upload_ssh_key
CURRENT_DATE=$(date +'%Y-%m-%d')
target="/data/openzim/nightly/$CURRENT_DATE"
zip libzim-javascript_wasm_$CURRENT_DATE.zip libzim-wasm.*
zip libzim-javascript_asm_$CURRENT_DATE.zip libzim-asm.*
for FILE in "libzim-javascript_wasm_$CURRENT_DATE.zip" "libzim-javascript_asm_$CURRENT_DATE.zip"
do
echo "Copying $FILE to $target"
scp -P 30022 -o StrictHostKeyChecking=no -i ./scripts/ssh_key "$FILE" ci@master.download.kiwix.org:$target
scp -P 30322 -o StrictHostKeyChecking=no -i ./scripts/upload_ssh_key "$FILE" javascript-libzim@master.download.kiwix.org:$target
done
8 changes: 4 additions & 4 deletions .github/workflows/upload_release_assets_to_kiwix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
VERSION: ${{ github.event.release.tag_name }}
DISPATCH_VERSION: ${{ github.event.inputs.version }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SSH_KEY: ${{ secrets.SSH_KEY }}
UPLOAD_SSH_KEY: ${{ secrets.JAVASCRIPTLIBZIM_FILE_UPLOAD_KEY }}

jobs:
upload:
Expand All @@ -40,9 +40,9 @@ jobs:
exit 1
}
echo "`nUsing tag: $version for version upload`n"
$SSH_KEY = $Env:SSH_KEY
if (! $SSH_KEY) {
$UPLOAD_SSH_KEY = $Env:UPLOAD_SSH_KEY
if (! $UPLOAD_SSH_KEY) {
Write-Warning "The SSH secret is empty!"
}
echo "$SSH_KEY" > .\scripts\ssh_key
echo "$UPLOAD_SSH_KEY" > .\scripts\upload_ssh_key
./scripts/Upload-KiwixRelease.ps1 -yes
4 changes: 2 additions & 2 deletions scripts/Upload-KiwixRelease.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ function Main {
$releaseFiles | % {
$filename = $_
if ($dryrun) {
"[DRYRUN] C:\Program Files\Git\usr\bin\scp.exe -P 30022 -o StrictHostKeyChecking=no -i $keyfile $filename ci@${server}:$target"
"[DRYRUN] C:\Program Files\Git\usr\bin\scp.exe -P 30322 -o StrictHostKeyChecking=no -i $keyfile $filename javascript-libzim@${server}:$target"
Write-Warning "No file was uploaded because this is a dry run.`n"
} else {
# Uploading file
& "C:\Program Files\Git\usr\bin\scp.exe" @('-P', '30022', '-o', 'StrictHostKeyChecking=no', '-i', "$keyfile", "$filename", "ci@${server}:$target")
& "C:\Program Files\Git\usr\bin\scp.exe" @('-P', '30322', '-o', 'StrictHostKeyChecking=no', '-i', "$keyfile", "$filename", "javascript-libzim@${server}:$target")
Write-Host "`nUploaded $filename to $server$target"
}
}
Expand Down
Loading