Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Flatpak: Use 7.1 Sdk, Update Dependencies #1264

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.

Sign up for GitHub

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

Merged
danirabbit merged 5 commits into from
Feb 7, 2023
Merged

Flatpak: Use 7.1 Sdk, Update Dependencies #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
610ac30
update flatpak dependencies
Marukesu Feb 2, 2023
0f091e1
Merge master branch
Marukesu Feb 4, 2023
0f0b5c9
CI: update the flatpak action to v5, remove run-tests option
Marukesu Feb 4, 2023
8efe03b
CI: update flatpak container image to 7.1
Marukesu Feb 4, 2023
977fb44
Merge branch 'master' into maru/update-flatpak
danirabbit Feb 7, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:7.1-${{ matrix.arch }}
options: --privileged

steps:
Expand All @@ -52,11 +52,10 @@ jobs:
platforms: arm64

- name: Build
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
uses: flatpak/flatpak-github-actions/flatpak-builder@v5
with:
bundle: code.flatpak
manifest-path: io.elementary.code.yml
run-tests: true
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
cache-key: "flatpak-builder-${{ github.sha }}"
Expand Down
23 changes: 13 additions & 10 deletions io.elementary.code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
app-id: io.elementary.code
runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime
runtime-version: '6'
runtime-version: '7.1'
sdk: io.elementary.Sdk
command: io.elementary.code
finish-args:
- '--filesystem=xdg-run/gvfsd'
- '--filesystem=host'

- '--share=ipc'
Expand All @@ -30,17 +31,18 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gtksourceview.git
tag: '4.8.0'
tag: '4.8.4'

- name: peas
buildsystem: meson
config-opts:
- '-Dgtk-doc=false'
- '-Dgtk_doc=false'
- '-Ddemos=false'
- '-Dvapi=true'
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/libpeas.git
tag: libpeas-1.28.0
tag: libpeas-1.34.0

- name: git2-glib
buildsystem: meson
Expand All @@ -50,7 +52,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/libgit2-glib.git
tag: v0.99.0.1
tag: v1.1.0
modules:
- name: ssh2
buildsystem: cmake-ninja
Expand All @@ -66,15 +68,15 @@ modules:
sources:
- type: git
url: https://github.com/libssh2/libssh2.git
tag: libssh2-1.9.0
tag: libssh2-1.10.0
- name: libgit2
buildsystem: cmake-ninja
config-opts:
- '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
sources:
- type: git
url: https://github.com/libgit2/libgit2.git
tag: 'v1.1.0'
tag: 'v1.5.1'

- name: editorconfig
buildsystem: cmake-ninja
Expand All @@ -84,7 +86,8 @@ modules:
sources:
- type: git
url: https://github.com/editorconfig/editorconfig-core-c.git
tag: 'v0.12.4'
tag: 'v0.12.6'
disable-submodules: true

- name: gtkspell
config-opts:
Expand All @@ -111,13 +114,13 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/vte.git
branch: '0.62.1'
branch: '0.70.2'

- name: universal-ctags
sources:
- type: git
url: https://github.com/universal-ctags/ctags.git
tag: p5.9.20201101.0
tag: v6.0.0

- name: code
buildsystem: meson
Expand Down