diff options
| -rw-r--r-- | .craft.ini | 8 | ||||
| -rw-r--r-- | .craft.shelf | 2 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 16 |
3 files changed, 21 insertions, 5 deletions
diff --git a/.craft.ini b/.craft.ini index 211206ff5..5c14092dc 100644 --- a/.craft.ini +++ b/.craft.ini @@ -43,7 +43,6 @@ Packager/UseCache = ${Variables:UseCache} Packager/CreateCache = ${Variables:CreateCache} Packager/CacheVersion = ${Variables:ownCloudVersion}/Qt_${Variables:QtVersion}_${Variables:CachePatchLvl} ; Packager/RepositoryUrl = https://files.kde.org/craft/ -Packager/PackageType = PortablePackager Packager/RepositoryUrl = https://download.owncloud.com/desktop/craft/cache/;https://files.kde.org/craft/master/ Compile/BuildType = RelWithDebInfo ContinuousIntegration/Enabled = ${Variables:CiBuild} @@ -84,6 +83,13 @@ Packager/PackageType = MacPkgPackager General/ABI = macos-64-clang Compile/BuildType = Debug +[linux-64-gcc] +General/ABI = linux-64-gcc + +[linux-64-gcc-BlueprintSettings] +libs/dbus.ignored = False +libs/qt5/qtbase.withDBus = True + [Env] CRAFT_CODESIGN_CERTIFICATE = SIGN_PACKAGE = False diff --git a/.craft.shelf b/.craft.shelf index 023a1fc82..768b5e4b4 100644 --- a/.craft.shelf +++ b/.craft.shelf @@ -46,7 +46,7 @@ version = 0.32.3 version = 1_1_3 [dev-utils/kshimgen] -version = 0.4.0 +version = 0.4.2 [dev-utils/libtool] version = 2.4.6 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 284b5fcb4..bb4894980 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,9 @@ jobs: - target: macos-64-clang os: macos-latest python: python3 + - target: linux-64-gcc + os: ubuntu-18.04 + python: python3 env: CRAFT: ${{ matrix.python }} "${{ github.workspace }}/CraftMaster/CraftMaster/CraftMaster.py" --config "${{ github.workspace }}/.craft.ini" --target ${{ matrix.target }} --variables "WORKSPACE=${{ github.workspace }}" -c @@ -48,8 +51,15 @@ jobs: - name: Craft unshelve run: Invoke-Expression "$env:CRAFT --unshelve `"${{ github.workspace }}/.craft.shelf`" " - - name: Install NSIS - run: Invoke-Expression "$env:CRAFT dev-utils/nsis" + - name: Prepare + run: | + if ($IsWindows) { + Invoke-Expression "$env:CRAFT dev-utils/nsis" + } elseif($IsLinux) { + sudo apt-get update -y + sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libmtdev1 libgl1-mesa-dev libmtdev1 libinput-dev libxkbcommon0 libxcb-icccm4 libxcb-image0 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 libxcb-keysyms1 libxcb-xinerama0 libsm6 + Invoke-Expression "$env:CRAFT dev-utils/linuxdeploy" + } - name: Install dependencies run: Invoke-Expression "$env:CRAFT --install-deps owncloud/owncloud-client" @@ -61,7 +71,7 @@ jobs: run: Invoke-Expression "$env:CRAFT --no-cache --src-dir `"${{ github.workspace }}`" --test owncloud/owncloud-client" - name: Package - run: if ($IsWindows) { Invoke-Expression "$env:CRAFT --no-cache --src-dir `"${{ github.workspace }}`" --package owncloud/owncloud-client" } else {Write-Host "Skip packaging on mac as the build gets stuck when mounting"} + run: if (-not $IsMacOS) { Invoke-Expression "$env:CRAFT --no-cache --src-dir `"${{ github.workspace }}`" --package owncloud/owncloud-client" } else {Write-Host "Skip packaging on mac as the build gets stuck when mounting"} - name: Update shelf run: | |