Skip to content

Commit

Permalink
Update base Flatpak SDK to 22.08
Browse files Browse the repository at this point in the history
  • Loading branch information
olof-nord committed Nov 22, 2022
1 parent 7c19ccf commit 6c8ab1e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ jobs:
name: Package as Flatpak web bundle
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08
options: --privileged

steps:
Expand All @@ -213,7 +213,7 @@ jobs:
name: Package as Flatpak QT bundle
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08
image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
options: --privileged

steps:
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,19 @@ install-axolotl-electron-bundle:

## Flatpak
build-dependencies-flatpak:
$(FLATPAK) install org.freedesktop.Sdk.Extension.golang//21.08
$(FLATPAK) install org.freedesktop.Sdk.Extension.node18//21.08
$(FLATPAK) install org.freedesktop.Sdk.Extension.rust-stable//21.08
$(FLATPAK) install org.freedesktop.Sdk.Extension.golang//22.08
$(FLATPAK) install org.freedesktop.Sdk.Extension.node18//22.08
$(FLATPAK) install org.freedesktop.Sdk.Extension.rust-stable//22.08

build-dependencies-flatpak-web: build-dependencies-flatpak
$(FLATPAK) install org.freedesktop.Platform//21.08
$(FLATPAK) install org.freedesktop.Sdk//21.08
$(FLATPAK) install org.electronjs.Electron2.BaseApp//21.08
$(FLATPAK) install org.freedesktop.Platform//22.08
$(FLATPAK) install org.freedesktop.Sdk//22.08
$(FLATPAK) install org.electronjs.Electron2.BaseApp//22.08

build-dependencies-flatpak-qt: build-dependencies-flatpak
$(FLATPAK) install org.kde.Platform//5.15-21.08
$(FLATPAK) install org.kde.Sdk//5.15-21.08
$(FLATPAK) install io.qt.qtwebengine.BaseApp//5.15-21.08
$(FLATPAK) install org.kde.Platform//5.15-22.08
$(FLATPAK) install org.kde.Sdk//5.15-22.08
$(FLATPAK) install io.qt.qtwebengine.BaseApp//5.15-22.08

build-flatpak-web:
$(FLATPAK_BUILDER) flatpak/build --verbose --force-clean --ccache flatpak/web/org.nanuc.Axolotl.yml
Expand Down
24 changes: 12 additions & 12 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@ Installation instructions can be found [here](https://flatpak.org/setup/)

The following Flatpak SDKs are required:
```
flatpak install org.freedesktop.Platform//21.08
flatpak install org.freedesktop.Sdk//21.08
flatpak install org.freedesktop.Sdk.Extension.golang//21.08
flatpak install org.freedesktop.Sdk.Extension.node18//21.08
flatpak install org.freedesktop.Sdk.Extension.rust-stable//21.08
flatpak install org.electronjs.Electron2.BaseApp//21.08
flatpak install org.freedesktop.Platform//22.08
flatpak install org.freedesktop.Sdk//22.08
flatpak install org.freedesktop.Sdk.Extension.golang//22.08
flatpak install org.freedesktop.Sdk.Extension.node18//22.08
flatpak install org.freedesktop.Sdk.Extension.rust-stable//22.08
flatpak install org.electronjs.Electron2.BaseApp//22.08
```

**Build and Install**
Expand Down Expand Up @@ -194,12 +194,12 @@ To start the application, either search for "Axolotl" in your app drawer or star

The following Flatpak SDKs are required:
```
flatpak install org.kde.Platform//5.15-21.08
flatpak install org.kde.Sdk//5.15-21.08
flatpak install org.freedesktop.Sdk.Extension.golang//21.08
flatpak install org.freedesktop.Sdk.Extension.node18//21.08
flatpak install org.freedesktop.Sdk.Extension.rust-stable//21.08
flatpak install io.qt.qtwebengine.BaseApp//5.15-21.08
flatpak install org.kde.Platform//5.15-22.08
flatpak install org.kde.Sdk//5.15-22.08
flatpak install org.freedesktop.Sdk.Extension.golang//22.08
flatpak install org.freedesktop.Sdk.Extension.node18//22.08
flatpak install org.freedesktop.Sdk.Extension.rust-stable//22.08
flatpak install io.qt.qtwebengine.BaseApp//5.15-22.08
```

**Build and Install**
Expand Down
4 changes: 2 additions & 2 deletions flatpak/qt/org.nanuc.Axolotl.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
app-id: org.nanuc.Axolotl
branch: main
runtime: org.kde.Platform
runtime-version: '5.15-21.08'
runtime-version: '5.15-22.08'
sdk: org.kde.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.golang
- org.freedesktop.Sdk.Extension.node18
- org.freedesktop.Sdk.Extension.rust-stable
command: axolotl
base: io.qt.qtwebengine.BaseApp
base-version: '5.15-21.08'
base-version: '5.15-22.08'
separate-locales: false
tags:
- latest
Expand Down
4 changes: 2 additions & 2 deletions flatpak/web/org.nanuc.Axolotl.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
app-id: org.nanuc.Axolotl
branch: main
runtime: org.freedesktop.Platform
runtime-version: '21.08'
runtime-version: '22.08'
sdk: org.freedesktop.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.golang
- org.freedesktop.Sdk.Extension.node18
- org.freedesktop.Sdk.Extension.rust-stable
command: run.sh
base: org.electronjs.Electron2.BaseApp
base-version: '21.08'
base-version: '22.08'
separate-locales: false
tags:
- latest
Expand Down

0 comments on commit 6c8ab1e

Please sign in to comment.