mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-02-03 12:31:15 +00:00
Further build cleanup
This commit is contained in:
parent
40b99bb08e
commit
55f98b9e8d
10
.github/workflows/release.yml
vendored
10
.github/workflows/release.yml
vendored
@ -4,11 +4,9 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- flatpak
|
||||
|
||||
env:
|
||||
APP_ID: org.legoisland.Isle
|
||||
BUILD_DIR: build
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@ -72,7 +70,7 @@ jobs:
|
||||
|
||||
- name: Configure (CMake)
|
||||
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 }} \
|
||||
-DISLE_USE_DX5=${{ !!matrix.dx5 }} \
|
||||
-DISLE_BUILD_CONFIG=${{ matrix.config }} \
|
||||
@ -82,11 +80,11 @@ jobs:
|
||||
-Werror=dev
|
||||
|
||||
- name: Build (CMake)
|
||||
run: cmake --build ${{ env.BUILD_DIR }} --verbose
|
||||
run: cmake --build build --verbose
|
||||
|
||||
- name: Package (CPack)
|
||||
run: |
|
||||
cd ${{ env.BUILD_DIR }}
|
||||
cd build
|
||||
cpack .
|
||||
|
||||
- name: Upload Artifact
|
||||
@ -94,7 +92,7 @@ jobs:
|
||||
with:
|
||||
name: Release-${{ matrix.name }}
|
||||
path: |
|
||||
${{ env.BUILD_DIR }}/dist/isle-*
|
||||
build/dist/isle-*
|
||||
|
||||
flatpak:
|
||||
name: "Flatpak (${{ matrix.arch }})"
|
||||
|
||||
@ -16,4 +16,4 @@ endif()
|
||||
|
||||
if(LINUX)
|
||||
add_subdirectory(linux)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -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
|
||||
configure_file(isledecomp.desktop.in "${APP_ID}.desktop" @ONLY)
|
||||
configure_file(isledecomp.metainfo.xml.in "${APP_ID}.metainfo.xml" @ONLY)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user