Merge pull request #731 from fpiesche/rename-freedesktop

Rename freedesktop
This commit is contained in:
fgsfds authored and GitHub committed 2026-05-29 09:46:49 +02:00
commit 514bf7affd
6 files changed
+21 -27

No files matched your search

+6 -13
View File
@@ -268,7 +268,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build-x86_64-linux] needs: [build-x86_64-linux]
container: container:
image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08 image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
options: --privileged options: --privileged
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -279,23 +279,16 @@ jobs:
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6 - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with: with:
bundle: io.github.fgsfdsfgs.perfect_dark.flatpak bundle: io.github.perfect_dark_pc_port.perfect_dark.flatpak
manifest-path: dist/linux/io.github.fgsfdsfgs.perfect_dark.yaml manifest-path: dist/linux/io.github.perfect_dark_pc_port.perfect_dark.yaml
cache-key: flatpak-builder-${{ github.sha }} cache-key: flatpak-builder-${{ github.sha }}
upload-artifact: false upload-artifact: false
# - name: Build Flatpak bundle
# run: |
# cd dist/linux/
# flatpak-builder build --force-clean io.github.fgsfdsfgs.perfect_dark.yaml
# flatpak build-export export build
# flatpak build-bundle export io.github.fgsfdsfgs.perfect_dark.flatpak io.github.fgsfdsfgs.perfect_dark
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: io.github.fgsfdsfgs.perfect_dark.flatpak name: io.github.perfect_dark_pc_port.perfect_dark.flatpak
path: io.github.fgsfdsfgs.perfect_dark.flatpak path: io.github.perfect_dark_pc_port.perfect_dark.flatpak
retention-days: 0 retention-days: 0
@@ -323,7 +316,7 @@ jobs:
zip -r ../ci-release/pd-i686-windows.zip pd-i686-windows zip -r ../ci-release/pd-i686-windows.zip pd-i686-windows
zip -r ../ci-release/pd-x86_64-windows.zip pd-x86_64-windows zip -r ../ci-release/pd-x86_64-windows.zip pd-x86_64-windows
zip -r ../ci-release/pd-arm64-nswitch.zip pd-arm64-nswitch zip -r ../ci-release/pd-arm64-nswitch.zip pd-arm64-nswitch
mv io.github.fgsfdsfgs.perfect_dark.flatpak/io.github.fgsfdsfgs.perfect_dark.flatpak ../ci-release/ mv io.github.perfect_dark_pc_port.perfect_dark.flatpak/io.github.perfect_dark_pc_port.perfect_dark.flatpak ../ci-release/
popd popd
git tag --force ci-dev-build port git tag --force ci-dev-build port
git push --force origin ci-dev-build git push --force origin ci-dev-build
@@ -1,8 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=Perfect Dark Name=Perfect Dark
Comment=Modern source port of Perfect Dark Comment=Modern source port of Perfect Dark
Exec=io.github.fgsfdsfgs.perfect_dark.sh Exec=io.github.perfect_dark_pc_port.perfect_dark.sh
Icon=io.github.fgsfdsfgs.perfect_dark Icon=io.github.perfect_dark_pc_port.perfect_dark
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Game;ActionGame; Categories=Game;ActionGame;
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application"> <component type="desktop-application">
<id>io.github.fgsfdsfgs.perfect_dark</id> <id>io.github.perfect_dark_pc_port.perfect_dark</id>
<name>Perfect Dark</name> <name>Perfect Dark</name>
<developer id="io.github.fgsfdsfgs.perfect_dark"> <developer id="io.github.perfect_dark_pc_port.perfect_dark">
<name>Perfect Dark Contributors</name> <name>Perfect Dark Contributors</name>
<url>https://github.com/fgsfdsfgs/perfect_dark/graphs/contributors</url> <url>https://github.com/fgsfdsfgs/perfect_dark/graphs/contributors</url>
</developer> </developer>
<launchable type="desktop-id">io.github.fgsfdsfgs.perfect_dark.desktop</launchable> <launchable type="desktop-id">io.github.perfect_dark_pc_port.perfect_dark.desktop</launchable>
<summary>Modern cross-platform port of Perfect Dark</summary> <summary>Modern cross-platform port of Perfect Dark</summary>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>MIT</project_license> <project_license>MIT</project_license>
@@ -17,8 +17,9 @@
<!-- <!--
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image type="source">https://gitlab.com/fpiesche/dxx-rebirth-assets/-/raw/c6e7e79eebe92905f84f07a635ffab5122a94bd1/d1x/screenshots/retromode.png</image> <image type="source"></image>
<caption>"Retro mode": the default graphics setup, like the original game but in high resolution</caption> <caption>Screenshot</caption>
</screenshot>
<screenshots> <screenshots>
--> -->
<categories> <categories>
@@ -1,8 +1,8 @@
app-id: io.github.fgsfdsfgs.perfect_dark app-id: io.github.perfect_dark_pc_port.perfect_dark
runtime: org.freedesktop.Platform runtime: org.freedesktop.Platform
runtime-version: "23.08" runtime-version: "25.08"
sdk: org.freedesktop.Sdk sdk: org.freedesktop.Sdk
command: io.github.fgsfdsfgs.perfect_dark.sh command: io.github.perfect_dark_pc_port.perfect_dark.sh
finish-args: finish-args:
- --device=all - --device=all
@@ -24,13 +24,13 @@ modules:
- type: file - type: file
path: bin/pd.pal.x86_64 path: bin/pd.pal.x86_64
- type: file - type: file
path: io.github.fgsfdsfgs.perfect_dark.sh path: io.github.perfect_dark_pc_port.perfect_dark.sh
- type: file - type: file
path: io.github.fgsfdsfgs.perfect_dark.png path: io.github.perfect_dark_pc_port.perfect_dark.png
- type: file - type: file
path: io.github.fgsfdsfgs.perfect_dark.metainfo.xml path: io.github.perfect_dark_pc_port.perfect_dark.metainfo.xml
- type: file - type: file
path: io.github.fgsfdsfgs.perfect_dark.desktop path: io.github.perfect_dark_pc_port.perfect_dark.desktop
build-commands: [] build-commands: []
post-install: post-install:
# Install the binaries # Install the binaries