GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-22 04:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16865 from Ultimaker/CURA-11087_fix_missing_asc

Browse Source 
Fix missing asc file in Linux build artifacts
This commit is contained in:
Jaime van Kessel 2023-10-02 15:33:36 +02:00 committed by GitHub
commit d404c7f9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/installers.yml vendored
View File

@ -168,14 +168,22 @@ jobs:
with: with:
name: ${{ steps.filename.outputs.LINUX }}-AppImage name: ${{ steps.filename.outputs.LINUX }}-AppImage
path: installers 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 - name: Rename Linux installer to nightlies
run: | run: |
mv installers/${{ steps.filename.outputs.LINUX }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage 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 - name: Update nightly release for Linux
run: | 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 --clobber
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc --clobber
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

8
.github/workflows/linux.yml vendored
View File

@ -257,6 +257,14 @@ jobs:
dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage
retention-days: 5 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 - name: Write the run info
shell: python shell: python
run: | run: |

4
packaging/AppImage-builder/create_appimage.py
View File

@ -38,7 +38,7 @@ def build_appimage(dist_path, version, appimage_filename):
""" """
generate_appimage_builder_config(dist_path, version, appimage_filename) generate_appimage_builder_config(dist_path, version, appimage_filename)
create_appimage() create_appimage()
sign_appimage(dist_path, appimage_filename) sign_appimage(appimage_filename)
def generate_appimage_builder_config(dist_path, version, appimage_filename): def generate_appimage_builder_config(dist_path, version, appimage_filename):
@ -85,7 +85,7 @@ def create_appimage():
raise RuntimeError(f"The AppImageTool command returned non-zero: {result}") 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] command = ["gpg", "--yes", "--armor", "--detach-sig", appimage_filename]
result = subprocess.call(command) result = subprocess.call(command)
if result != 0: if result != 0: