nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'mjog/ci-3-38' into 'mainline'"

Browse source 
This reverts merge request !598
This commit is contained in:
Michael Gratton 2020-10-04 10:41:40 +00:00
parent d2a0694866
commit 5819012d90
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -81,7 +81,7 @@ ubuntu:
expire_in: 2 days expire_in: 2 days
flatpak: flatpak:
image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.38' image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
variables: variables:
APP_ID: org.gnome.Geary.Devel APP_ID: org.gnome.Geary.Devel
FLATPAK_MODULE: geary FLATPAK_MODULE: geary

6
org.gnome.Geary.yaml
View file

@ -14,7 +14,7 @@
app-id: org.gnome.Geary.Devel app-id: org.gnome.Geary.Devel
branch: master branch: master
runtime: org.gnome.Platform runtime: org.gnome.Platform
runtime-version: "3.38" runtime-version: master
sdk: org.gnome.Sdk sdk: org.gnome.Sdk
command: geary command: geary
@ -152,7 +152,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://gitlab.gnome.org/GNOME/evolution-data-server.git url: https://gitlab.gnome.org/GNOME/evolution-data-server.git
branch: gnome-3-38 branch: master
cleanup: cleanup:
- /lib/cmake - /lib/cmake
- /lib/evolution-data-server/*-backends - /lib/evolution-data-server/*-backends
@ -242,4 +242,4 @@ modules:
sources: sources:
- type: git - type: git
url: https://gitlab.gnome.org/GNOME/geary.git url: https://gitlab.gnome.org/GNOME/geary.git
branch: gnome-3-38 branch: mainline