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

Release upload fixes #12050

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/pr_build_kolibri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
dmg:
name: Build DMG file
needs: whl
uses: learningequality/kolibri-app/.github/workflows/build_mac.yml@main
uses: learningequality/kolibri-app/.github/workflows/build_mac.yml@v0.4.0
with:
whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
ref: main
ref: v0.4.0
deb:
name: Build DEB file
needs: whl
Expand All @@ -48,10 +48,10 @@ jobs:
exe:
name: Build EXE file
needs: whl
uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].0
uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].1
with:
whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
ref: v1.6.0
ref: v1.6.1
apk:
name: Build APK file
needs: whl
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release_kolibri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ jobs:
exe:
name: Build EXE file
needs: whl
uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].0
uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].1
with:
whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
release: true
ref: v1.6.0
ref: v1.6.1
secrets:
KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE: ${{ secrets.KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE }}
KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE_PASSWORD }}
Expand All @@ -86,10 +86,10 @@ jobs:
zip:
name: Build Raspberry Pi Image
needs: deb
uses: learningequality/pi-gen/.github/workflows/[email protected].0
uses: learningequality/pi-gen/.github/workflows/[email protected].1
with:
deb-file-name: ${{ needs.deb.outputs.deb-file-name }}
ref: v0.16.0
ref: v0.16.1
upload_zip:
uses: ./.github/workflows/upload_github_release_asset.yml
needs: zip
Expand Down Expand Up @@ -184,13 +184,13 @@ jobs:
- name: Upload files to Google Cloud Storage
uses: 'google-github-actions/upload-cloud-storage@v2'
with:
path: 'dist/${{ matrix.filename }}'
path: 'dist/${{ matrix.filename }}/${{ matrix.filename }}'
Copy link
Member

Choose a reason for hiding this comment

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

why is ${{ matrix.filename }} in here twice?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's because of this fun quirk of the download-artifacts action: https://github.com/actions/download-artifact?tab=readme-ov-file#download-all-artifacts

Basically, artifacts get downloaded into a folder with the same name as the file, for reasons that I have still not adequately understood :)

destination: '${{ secrets.KOLIBRI_PUBLIC_RELEASE_GCS_BUCKET }}/downloads/kolibri/${{ github.event.release.name }}/${{ matrix.filename }}'
- name: Upload to BCK bucket
if: ${{ github.event.release.name == 'latest' }} && ${{ endsWith(matrix.filename, '.whl') }}
uses: 'google-github-actions/upload-cloud-storage@v2'
with:
path: 'dist/${{ matrix.filename }}'
path: 'dist/${{ matrix.filename }}/${{ matrix.filename }}'
destination: '${{ secrets.BCK_PROD_BUILD_ARTIFACT_GCS_BUCKET }}/${{ matrix.filename }}'
android_release:
name: Release Android App
Expand Down
Loading