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

CURA-12091 Fix crash when started from AppImage #19

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
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
42 changes: 21 additions & 21 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ on:
options:
- ubuntu-22.04
- ubuntu-20.04
- self-hosted-Ubuntu22-X64
workflow_call:
inputs:
plugin_conan_version:
Expand Down Expand Up @@ -63,38 +64,37 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout Cura-workflows repo
uses: actions/checkout@v4
with:
repository: Ultimaker/Cura-workflows
path: Cura-workflows

- name: Setup Python and pip
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11.x'
cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt
python-version: 3.11.x
cache: pip
cache-dependency-path: Cura-workflows/.github/workflows/requirements-runner.txt

- name: Install Python requirements for runner
run: pip install -r .github/workflows/requirements-conan-package.txt

- name: Cache Conan local repository packages (Bash)
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
$HOME/.conan/data
$HOME/.conan/conan_download_cache
key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache

- name: Install Linux system requirements
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt update
sudo apt upgrade
sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y

- name: Install GCC-13
- name: Install Linux system requirements for building
working-directory: Cura-workflows/runner_scripts
run: |
sudo apt install g++-13 gcc-13 -y
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
chmod +x ubuntu_setup.sh
sudo ./ubuntu_setup.sh

- name: Get Conan configuration
run: |
Expand All @@ -116,15 +116,15 @@ jobs:
conan upload "*" -r cura --all -c

- name: Upload the binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-${{ runner.arch }}
path: |
plugin_inst/curaengine_plugin_infill_generate
retention-days: 5

- name: Upload the cura plugin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-cura-plugin
path: |
Expand All @@ -139,7 +139,7 @@ jobs:
f.writelines(f'echo "PLUGIN_CONAN_VERSION={os.environ["PLUGIN_CONAN_VERSION"]}" >> $GITHUB_ENV\n')

- name: Upload the run info
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-run-info
path: |
Expand All @@ -157,4 +157,4 @@ jobs:
success_body: "Installers for ${{ inputs.plugin_conan_version }}"
failure_title: "Failed to create the Cura distributions"
failure_body: "Failed to create at least 1 installer for ${{ inputs.plugin_conan_version }}"
secrets: inherit
secrets: inherit
66 changes: 40 additions & 26 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ on:
operating_system:
description: 'OS'
required: true
default: 'macos-11'
default: 'macos-12'
type: choice
options:
- self-hosted
- self-hosted-X64
- self-hosted-ARM64
- macos-12
workflow_call:
inputs:
Expand Down Expand Up @@ -64,39 +65,52 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout Cura-workflows repo
uses: actions/checkout@v4
with:
repository: Ultimaker/Cura-workflows
path: Cura-workflows

- name: Setup Python and pip
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10.x'
cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt
python-version: 3.11.x
cache: pip
cache-dependency-path: Cura-workflows/.github/workflows/requirements-runner.txt

- name: Install Python requirements for runner
run: pip install -r .github/workflows/requirements-conan-package.txt
- name: Install Python requirements and Create default Conan profile
run: pip install -r Cura-workflows/.github/workflows/requirements-runner.txt

- name: Cache Conan local repository packages (Bash)
uses: actions/cache@v3
with:
path: |
$HOME/.conan/data
$HOME/.conan/conan_download_cache
key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache
- name: Install Macos system requirements for building
working-directory: Cura-workflows/runner_scripts
run: |
chmod +x macos_setup.sh
./macos_setup.sh

- name: Install MacOS system requirements
run: brew install cmake autoconf automake ninja create-dmg
- name: Setup pipeline caches
run: |
mkdir -p /Users/runner/.conan/downloads

- name: Create the default Conan profile
- name: Create default Conan profile
run: conan profile new default --detect --force

- name: Get Conan configuration
run: |
conan config install https://github.com/Ultimaker/conan-config.git
conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}"

- name: Use Conan download cache (Bash)
run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache"
- name: Add runner credentials to cura remote
run: conan user -p ${{ secrets.CONAN_PASS }} -r cura ${{ secrets.CONAN_USER }}

- name: Cache Conan downloads
uses: actions/cache@v4
with:
path: /home/runner/.conan/downloads
key: ${{ runner.os }}-conan-downloads-${{ github.run_id }}
restore-keys: |
${{ runner.os }}-conan-downloads-

- name: Remove private Artifactory
run: conan remote remove cura-conan-private || true
Expand All @@ -110,17 +124,17 @@ jobs:
conan upload "*" -r cura --all -c

- name: Upload the binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-${{ runner.arch }}
path: |
plugin_inst/curaengine_plugin_infill_generate
retention-days: 5

- name: Upload the cura plugin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-cura-plugin
name: macos-cura-plugin-${{ runner.arch }}
path: |
plugin_inst/CuraEngineTiledInfill/**/*
retention-days: 5
Expand All @@ -133,9 +147,9 @@ jobs:
f.writelines(f'echo "PLUGIN_CONAN_VERSION={os.environ["PLUGIN_CONAN_VERSION"]}" >> $GITHUB_ENV\n')

- name: Upload the run info
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos-run-info
name: macos-run-info-${{ runner.arch }}
path: |
run_info.sh
retention-days: 5
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
plugin_conan_version: ${{ inputs.plugin_conan_version }}
conan_args: ${{ inputs.conan_args }}
architecture: X64
operating_system: windows-2022
operating_system: self-hosted-Windows-X64
secrets: inherit

linux-modern-installer:
Expand All @@ -31,7 +31,7 @@ jobs:
plugin_conan_version: ${{ inputs.plugin_conan_version }}
conan_args: ${{ inputs.conan_args }}
architecture: X64
operating_system: ubuntu-22.04
operating_system: self-hosted-Ubuntu22-X64
secrets: inherit

macos-installer:
Expand All @@ -40,7 +40,7 @@ jobs:
plugin_conan_version: ${{ inputs.plugin_conan_version }}
conan_args: ${{ inputs.conan_args }}
architecture: X64
operating_system: macos-12
operating_system: self-hosted-X64
secrets: inherit

macos-arm-installer:
Expand All @@ -49,7 +49,7 @@ jobs:
plugin_conan_version: ${{ inputs.plugin_conan_version }}
conan_args: ${{ inputs.conan_args }}
architecture: ARM64
operating_system: self-hosted
operating_system: self-hosted-ARM64
secrets: inherit

create-curapackages:
Expand All @@ -58,10 +58,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download the run info
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: linux-run-info

Expand All @@ -70,37 +70,37 @@ jobs:
. run_info.sh

- name: Download the Cura plugin
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: linux-cura-plugin
path: cura-plugin

- name: Download linux modern binary artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: Linux-X64
path: cura-plugin/CuraEngineTiledInfill/x86_64/Linux

- name: Download mac x64 binary artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: macOS-X64
path: cura-plugin/CuraEngineTiledInfill/x86_64/Darwin

- name: Download mac arm binaries artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: macOS-ARM64
path: cura-plugin/CuraEngineTiledInfill/arm64/Darwin

- name: Download win X64 binaries artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: Windows-X64
path: cura-plugin/CuraEngineTiledInfill/x86_64/Windows

- name: Upload the Cura plugin source
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cura-plugin
path: |
Expand All @@ -113,7 +113,7 @@ jobs:
package_info_path: "cura-plugin/CuraEngineTiledInfill/package.json"

- name: Upload the Cura package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cura-package
path: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python and pip
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11.x'
cache: 'pip'
Expand All @@ -75,7 +75,7 @@ jobs:
run: pip install -r .github/workflows/requirements-conan-package.txt

- name: Cache Conan local repository packages (Powershell)
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
C:\Users\runneradmin\.conan\data
Expand Down Expand Up @@ -103,15 +103,15 @@ jobs:
conan upload "*" -r cura --all -c

- name: Upload the binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-${{ runner.arch }}
path: |
plugin_inst/curaengine_plugin_infill_generate.exe
retention-days: 5

- name: Upload the cura plugin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-cura-plugin
path: |
Expand All @@ -128,7 +128,7 @@ jobs:

# NOTE: The extension is .sh, since this isn't going to build-environment, so not on the Win build image.
- name: Upload the run info
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-run-info
path: |
Expand All @@ -146,4 +146,4 @@ jobs:
success_body: "Installers for ${{ inputs.plugin_conan_version }}"
failure_title: "Failed to create the Cura distributions"
failure_body: "Failed to create at least 1 installer for ${{ inputs.plugin_conan_version }}"
secrets: inherit
secrets: inherit
4 changes: 2 additions & 2 deletions conandata.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version: "0.2.0-alpha.0"
version: "0.2.1"
requirements:
- "curaengine_grpc_definitions/(latest)@ultimaker/testing"
- "curaengine_grpc_definitions/0.2.1"
Loading
Loading