diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85a28460..fb135934 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,7 @@ jobs: build-flatpak: name: Build Flatpak runs-on: ubuntu-24.04 - container: - image: bilelmoussaoui/flatpak-github-actions:gnome-44 - options: --privileged - + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -33,26 +30,24 @@ jobs: token: ${{ secrets.ASSET_REPO_TOKEN }} path: flatpak/private - - name: Install dependencies - run: |- - apt-get update - apt-get install -y ninja-build libsdl2-dev libgtk-3-dev +# - name: Install dependencies +# run: |- +# sudo apt update +# sudo apt install -y ninja-build libsdl2-dev libgtk-3-dev flatpak-builder - name: Prepare Flatpak run: | flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install -y flathub org.freedesktop.Sdk//${{env.FREEDESKTOP_VERSION}} - flatpak install -y flathub org.freedesktop.Sdk.Extension.llvm${{env.LLVM_VERSION}}//${{env.FREEDESKTOP_VERSION}} + flatpak install -y flathub org.freedesktop.Sdk//${{ env.FREEDESKTOP_VERSION }} + flatpak install -y flathub org.freedesktop.Sdk.Extension.llvm${{ env.LLVM_VERSION }}//${{ env.FREEDESKTOP_VERSION }} - name: Build Flatpak - uses: flatpak/flatpak-github-actions/flatpak-builder@master - with: - bundle: ${{env.FLATPAK_ID}}.flatpak - manifest-path: ./flatpak/${{env.FLATPAK_ID}}.json - upload-artifact: false + run: | + flatpak-builder --force-clean --user --install-deps-from=flathub --repo=repo --install builddir ${{ env.FLATPAK_ID }}.json + flatpak build-bundle repo ${{ env.FLATPAK_ID }}.flatpak ${{ env.FLATPAK_ID }} --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo - name: Upload artifact uses: actions/upload-artifact@v4 with: name: UnleashedRecomp-flatpak - path: ./${{env.FLATPAK_ID}}.flatpak \ No newline at end of file + path: ./${{ env.FLATPAK_ID }}.flatpak \ No newline at end of file