Skip to content

Commit 7b11d18

Browse files
danirabbitjeremypwleonardo-lemosryonakano
authored
Bump platform to 8.2 (#1545)
* Bump platform to 8.1 * Update ci.yml * Install libs under /app/lib instead of /app/lib64 * Flatpak: bump platform to 8.2 * Install gtksourceview under /app/lib explicitly * Install libpeas under /app/lib explicitly * Set libdir globally --------- Co-authored-by: Jeremy Wootten <jeremywootten@gmail.com> Co-authored-by: Leonardo Lemos <leonardolemos@live.com> Co-authored-by: Ryo Nakano <ryonakaknock3@gmail.com>
1 parent 3fde2b5 commit 7b11d18

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646

4747
container:
48-
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
48+
image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
4949
options: --privileged
5050

5151
steps:

io.elementary.code.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
app-id: io.elementary.code
1+
id: io.elementary.code
22
runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime
3-
runtime-version: '8' # Does not build with version '8.1' for some reason
3+
runtime-version: '8.2'
44
sdk: io.elementary.Sdk
55
command: io.elementary.code
66
finish-args:
@@ -26,6 +26,8 @@ cleanup:
2626
- '/share/vala'
2727
- '*.a'
2828
- '*.la'
29+
build-options:
30+
libdir: /app/lib
2931
modules:
3032
- name: gtksourceview
3133
buildsystem: meson
@@ -66,7 +68,6 @@ modules:
6668
- '-DBUILD_SHARED_LIBS:BOOL=ON'
6769
- '-DBUILD_EXAMPLES:BOOL=OFF'
6870
- '-DBUILD_TESTING:BOOL=OFF'
69-
- '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib'
7071
cleanup:
7172
- '/share/man'
7273
- '/share/doc'

0 commit comments

Comments
 (0)