From 78815617f58208930f8f7cc7ef4951644b9ed0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20For=C3=A9?= <daniel@elementary.io>
Date: Tue, 18 May 2021 10:17:03 -0700
Subject: [PATCH 1/2] Update io.elementary.code.yml

---
 io.elementary.code.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io.elementary.code.yml b/io.elementary.code.yml
index e23ed832ad..29cdbc54c2 100644
--- a/io.elementary.code.yml
+++ b/io.elementary.code.yml
@@ -1,6 +1,6 @@
 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: '0.1.0'
+runtime-version: 'daily'
 sdk: io.elementary.Sdk
 command: io.elementary.code
 finish-args:
@@ -12,6 +12,7 @@ finish-args:
 
   - '--talk-name=org.gtk.vfs.*'
   - '--talk-name=org.gnome.SettingsDaemon'
+  - '--talk-name=org.elementary.Contractor'
 
   - '--metadata=X-DConf=migrate-path=/io/elementary/code/'
 cleanup:

From 2b7d6a68f9ac52cab6b7564f78da048d5d30da07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20For=C3=A9?= <daniel@elementary.io>
Date: Tue, 18 May 2021 10:18:46 -0700
Subject: [PATCH 2/2] Update and rename main.yml to ci.yml

---
 .github/workflows/{main.yml => ci.yml} | 30 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
 rename .github/workflows/{main.yml => ci.yml} (64%)

diff --git a/.github/workflows/main.yml b/.github/workflows/ci.yml
similarity index 64%
rename from .github/workflows/main.yml
rename to .github/workflows/ci.yml
index c0597dc277..126bb3e4e8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/ci.yml
@@ -1,17 +1,21 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     container:
       image: elementary/docker:unstable
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Install Dependencies
       run: |
         apt update
@@ -25,31 +29,33 @@ jobs:
         ninja -C build install
 
   flatpak:
-
+    name: Flatpak
     runs-on: ubuntu-latest
 
     container:
-      image: docker.io/bilelmoussaoui/flatpak-github-actions
+      image: ghcr.io/elementary/flatpak-platform/runtime:daily
       options: --privileged
 
     steps:
+    - name: Checkout
     - uses: actions/checkout@v2
-    - uses: bilelmoussaoui/flatpak-github-actions@master
+
+    - name: Build
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
       with:
-        bundle: "io.elementary.code.flatpak"
-        manifest-path: "io.elementary.code.yml"
-        repository-name: "elementary"
-        repository-url: "https://flatpak.elementary.io/elementary.flatpakrepo"
+        bundle: code.flatpak
+        manifest-path: io.elementary.code.yml
+        repository-name: appcenter
+        repository-url: https://flatpak.elementary.io/repo.flatpakrepo
         cache-key: "flatpak-builder-${{ github.sha }}"
 
   lint:
-
     runs-on: ubuntu-latest
 
     container:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Lint
       run: io.elementary.vala-lint -d .