Skip to content

Commit 66c8e61

Browse files
authored
Update Flatpak CI (#1031)
1 parent d822d7f commit 66c8e61

2 files changed

Lines changed: 20 additions & 13 deletions

File tree

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- reopened
8+
- synchronize
49

510
jobs:
611
build:
7-
812
runs-on: ubuntu-latest
913

1014
container:
1115
image: elementary/docker:unstable
1216

1317
steps:
14-
- uses: actions/checkout@v1
18+
- uses: actions/checkout@v2
1519
- name: Install Dependencies
1620
run: |
1721
apt update
@@ -25,31 +29,33 @@ jobs:
2529
ninja -C build install
2630
2731
flatpak:
28-
32+
name: Flatpak
2933
runs-on: ubuntu-latest
3034

3135
container:
32-
image: docker.io/bilelmoussaoui/flatpak-github-actions
36+
image: ghcr.io/elementary/flatpak-platform/runtime:daily
3337
options: --privileged
3438

3539
steps:
40+
- name: Checkout
3641
- uses: actions/checkout@v2
37-
- uses: bilelmoussaoui/flatpak-github-actions@master
42+
43+
- name: Build
44+
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
3845
with:
39-
bundle: "io.elementary.code.flatpak"
40-
manifest-path: "io.elementary.code.yml"
41-
repository-name: "elementary"
42-
repository-url: "https://flatpak.elementary.io/elementary.flatpakrepo"
46+
bundle: code.flatpak
47+
manifest-path: io.elementary.code.yml
48+
repository-name: appcenter
49+
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
4350
cache-key: "flatpak-builder-${{ github.sha }}"
4451

4552
lint:
46-
4753
runs-on: ubuntu-latest
4854

4955
container:
5056
image: valalang/lint
5157

5258
steps:
53-
- uses: actions/checkout@v1
59+
- uses: actions/checkout@v2
5460
- name: Lint
5561
run: io.elementary.vala-lint -d .

io.elementary.code.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
app-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: '0.1.0'
3+
runtime-version: 'daily'
44
sdk: io.elementary.Sdk
55
command: io.elementary.code
66
finish-args:
@@ -12,6 +12,7 @@ finish-args:
1212

1313
- '--talk-name=org.gtk.vfs.*'
1414
- '--talk-name=org.gnome.SettingsDaemon'
15+
- '--talk-name=org.elementary.Contractor'
1516

1617
- '--metadata=X-DConf=migrate-path=/io/elementary/code/'
1718
cleanup:

0 commit comments

Comments
 (0)