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

Implement current suggestions

Browse Source
This commit is contained in:
Brenden Davidson 2025-06-29 13:22:37 -05:00
parent 2d5bf86ca4
commit 163468d211
No known key found for this signature in database
GPG Key ID: EBED6775E0A324BD
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.editorconfig
View File

@ -14,3 +14,8 @@ trim_trailing_whitespace = true
[{CMakeLists.txt,*.cmake}] [{CMakeLists.txt,*.cmake}]
indent_size = 2 indent_size = 2
insert_final_newline = true
[*.{json,xml.in,desktop.in}]
indent_size = 2
insert_final_newline = true

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

@ -4,9 +4,7 @@ on:
push: push:
branches: branches:
- master - master
- flatpak
env:
APP_ID: org.legoisland.Isle
jobs: jobs:
build: build:
@ -118,8 +116,8 @@ jobs:
- name: Build Flatpak - name: Build Flatpak
uses: flatpak/flatpak-github-actions/flatpak-builder@v6 uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with: with:
bundle: ${{ env.APP_ID }}.${{ matrix.arch }}.flatpak bundle: org.legoisland.Isle.${{ matrix.arch }}.flatpak
manifest-path: packaging/linux/flatpak/${{ env.APP_ID }}.json manifest-path: packaging/linux/flatpak/org.legoisland.Isle.json
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
release: release:

4
packaging/CMakeLists.txt
View File

@ -6,9 +6,9 @@ set(APP_SPDX "LGPL-3.0-or-later")
string(TIMESTAMP BUILD_DATE UTC) string(TIMESTAMP BUILD_DATE UTC)
# The following will need to be refined if we wish to post actual releases to a repo such as Flathub # The following will need to be refined if we wish to post actual releases to a repo such as Flathub
if(DEFINED ENV{GITHUB_RUN_ATTEMPT}) if(DEFINED ENV{GITHUB_ACTIONS} AND ENV{GITHUB_ACTIONS} EQUAL TRUE)
# Use the sequential run# of the current pipeline when running in GH Actions # Use the sequential run# of the current pipeline when running in GH Actions
set(SEMANTIC_VERSION "${PROJECT_VERSION}~build$ENV{GITHUB_RUN_ATTEMPT}") set(SEMANTIC_VERSION "${PROJECT_VERSION}~build$ENV{GITHUB_RUN_NUMBER}")
else() else()
# Don't worry about the build number for local builds # Don't worry about the build number for local builds
set(SEMANTIC_VERSION "${PROJECT_VERSION}") set(SEMANTIC_VERSION "${PROJECT_VERSION}")

4
packaging/linux/isledecomp.desktop.in
View File

@ -28,8 +28,10 @@ Actions=play;configure
[Desktop Action play] [Desktop Action play]
Name=Play Game Name=Play Game
Icon=currenttrack_play
Exec=isle Exec=isle
[Desktop Action configure] [Desktop Action configure]
Name=Configure Settings Name=Configure Settings
Exec=config Icon=settings
Exec=isle-config

2
packaging/linux/isledecomp.metainfo.xml.in
View File

@ -84,6 +84,6 @@
</keywords> </keywords>
<releases> <releases>
<release version="@SEMANTIC_VERSION@" type="development" date="@BUILD_DATE@"/> <release version="@SEMANTIC_VERSION@" type="development" date="@BUILD_DATE@" />
</releases> </releases>
</component> </component>