Skip to content

Commit

Permalink
Fix missing asc file in Linux build artifacts
Browse files Browse the repository at this point in the history
The asc was created for the AppImage, but never uploaded as an
artifact.

Fixes CURA-11087
  • Loading branch information
jellespijker committed Oct 2, 2023
1 parent 5552b5c commit 6106ade
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,22 @@ jobs:
with:
name: ${{ steps.filename.outputs.LINUX }}-AppImage
path: installers

- name: Download linux installer jobs asc artifacts
uses: actions/download-artifact@v2
with:
name: ${{ steps.filename.outputs.LINUX }}-asc
path: installers

- name: Rename Linux installer to nightlies
run: |
mv installers/${{ steps.filename.outputs.LINUX }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage
mv installers/${{ steps.filename.outputs.LINUX }}.AppImage.asc installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc
- name: Update nightly release for Linux
run: |
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc --clobber
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,14 @@ jobs:
dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage
retention-days: 5

- name: Upload the asc
uses: actions/upload-artifact@v3
with:
name: ${{ steps.filename.outputs.INSTALLER_FILENAME }}-asc
path: |
dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage.asc
retention-days: 5

- name: Write the run info
shell: python
run: |
Expand Down
4 changes: 2 additions & 2 deletions packaging/AppImage-builder/create_appimage.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def build_appimage(dist_path, version, appimage_filename):
"""
generate_appimage_builder_config(dist_path, version, appimage_filename)
create_appimage()
sign_appimage(dist_path, appimage_filename)
sign_appimage(appimage_filename)


def generate_appimage_builder_config(dist_path, version, appimage_filename):
Expand Down Expand Up @@ -85,7 +85,7 @@ def create_appimage():
raise RuntimeError(f"The AppImageTool command returned non-zero: {result}")


def sign_appimage(dist_path, appimage_filename):
def sign_appimage(appimage_filename):
command = ["gpg", "--yes", "--armor", "--detach-sig", appimage_filename]
result = subprocess.call(command)
if result != 0:
Expand Down

0 comments on commit 6106ade

Please sign in to comment.