Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flatpak builds to releases #196

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
GITHUB_REPOSITORY: ${{ github.repository }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

Expand All @@ -42,6 +42,9 @@ jobs:
- name: Dotnet Build (Fedora)
run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=WINE_XIV_FEDORA_LINUX --no-restore -o ./dist/XIVLauncher.Core-fedora

- name: Dotnet Build (Flatpak)
run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=FLATPAk --no-restore -o ./dist/XIVLauncher.Core-flatpak

- name: Dotnet Build (Windows)
run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64

Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/generate_flatpak_nuget_deps.yml

This file was deleted.

29 changes: 7 additions & 22 deletions .github/workflows/make-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
GITHUB_REPOSITORY: ${{ github.repository }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0
Expand All @@ -26,14 +26,6 @@ jobs:
with:
python-version: 3.x

- name: Setup Flatpak
run: |
sudo apt update -y
sudo apt install flatpak -y
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install --user org.freedesktop.Sdk.Extension.dotnet8/x86_64/23.08 -y
flatpak install --user org.freedesktop.Sdk/x86_64/23.08 -y

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
Expand All @@ -51,6 +43,10 @@ jobs:
working-directory: ./src/XIVLauncher.Core/
run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=WINE_XIV_ARCH_LINUX --no-restore -o ./dist/XIVLauncher.Core-arch

- name: Dotnet Build (Flatpak)
working-directory: ./src/XIVLauncher.Core/
run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=FLATPAK --no-restore -o ./dist/XIVLauncher.Core-flatpak

- name: Dotnet Build (Fedora)
working-directory: ./src/XIVLauncher.Core/
run: dotnet publish -r linux-x64 --sc --configuration Release -p:DefineConstants=WINE_XIV_FEDORA_LINUX --no-restore -o ./dist/XIVLauncher.Core-fedora
Expand All @@ -59,26 +55,14 @@ jobs:
working-directory: ./src/XIVLauncher.Core/
run: dotnet publish -r win-x64 --sc --configuration Release -o ./dist/XIVLauncher.Core-win10x64

- name: Generate nuget-dependencies.json
working-directory: ./src/XIVLauncher.Core/
run: |
curl -LO https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/dotnet/flatpak-dotnet-generator.py
python3 flatpak-dotnet-generator.py --dotnet 8 --freedesktop 23.08 nuget-dependencies.json XIVLauncher.Core.csproj

- name: Upload nuget-dependencies.json
uses: actions/upload-artifact@v3
with:
name: nuget-dependencies
path: |
./src/XIVLauncher.Core/nuget-dependencies.json

- name: Compress release files
run: |
sudo apt install zip -y
mkdir -p ./dist
# remove leading directories
tar -czf ./dist/XIVLauncher.Core.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core .
tar -czf ./dist/XIVLauncher.Core-arch.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-arch .
tar -czf ./dist/XIVLauncher.Core-flatpak.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-flatpak .
tar -czf ./dist/XIVLauncher.Core-fedora.tar.gz -C ./src/XIVLauncher.Core/dist/XIVLauncher.Core-fedora .
zip -r ./dist/XIVLauncher.Core-win10x64.zip ./src/XIVLauncher.Core/dist/XIVLauncher.Core-win10x64

Expand All @@ -91,5 +75,6 @@ jobs:
files: |
./dist/XIVLauncher.Core.tar.gz
./dist/XIVLauncher.Core-arch.tar.gz
./dist/XIVLauncher.Core-flatpak.tar.gz
./dist/XIVLauncher.Core-fedora.tar.gz
./dist/XIVLauncher.Core-win10x64.zip
Loading