isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further build cleanup

Browse Source
This commit is contained in:
Brenden Davidson 2025-06-29 12:54:26 -05:00
parent 40b99bb08e
commit 55f98b9e8d
No known key found for this signature in database
GPG Key ID: EBED6775E0A324BD
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/release.yml vendored
View File

@ -4,11 +4,9 @@ on:
push: push:
branches: branches:
- master - master
- flatpak
env: env:
APP_ID: org.legoisland.Isle APP_ID: org.legoisland.Isle
BUILD_DIR: build
jobs: jobs:
build: build:
@ -72,7 +70,7 @@ jobs:
- name: Configure (CMake) - name: Configure (CMake)
run: | run: |
${{ matrix.cmake-wrapper || '' }} cmake -S . -B ${{ env.BUILD_DIR }} -GNinja \ ${{ matrix.cmake-wrapper || '' }} cmake -S . -B build -GNinja \
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \ -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
-DISLE_USE_DX5=${{ !!matrix.dx5 }} \ -DISLE_USE_DX5=${{ !!matrix.dx5 }} \
-DISLE_BUILD_CONFIG=${{ matrix.config }} \ -DISLE_BUILD_CONFIG=${{ matrix.config }} \
@ -82,11 +80,11 @@ jobs:
-Werror=dev -Werror=dev
- name: Build (CMake) - name: Build (CMake)
run: cmake --build ${{ env.BUILD_DIR }} --verbose run: cmake --build build --verbose
- name: Package (CPack) - name: Package (CPack)
run: | run: |
cd ${{ env.BUILD_DIR }} cd build
cpack . cpack .
- name: Upload Artifact - name: Upload Artifact
@ -94,7 +92,7 @@ jobs:
with: with:
name: Release-${{ matrix.name }} name: Release-${{ matrix.name }}
path: | path: |
${{ env.BUILD_DIR }}/dist/isle-* build/dist/isle-*
flatpak: flatpak:
name: "Flatpak (${{ matrix.arch }})" name: "Flatpak (${{ matrix.arch }})"

6
packaging/linux/CMakeLists.txt
View File

@ -1,9 +1,3 @@
if(DEFINED ENV{FLATPAK_DEST})
set(FLATPAK TRUE)
else()
set(FLATPAK FALSE)
endif()
# Injects the required variables into the Desktop and MetaInfo files # Injects the required variables into the Desktop and MetaInfo files
configure_file(isledecomp.desktop.in "${APP_ID}.desktop" @ONLY) configure_file(isledecomp.desktop.in "${APP_ID}.desktop" @ONLY)
configure_file(isledecomp.metainfo.xml.in "${APP_ID}.metainfo.xml" @ONLY) configure_file(isledecomp.metainfo.xml.in "${APP_ID}.metainfo.xml" @ONLY)