Skip to content

io.elementary.Sdk.json: base it on GNOME 41 runtime #52

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
Oct 29, 2021
Merged

io.elementary.Sdk.json: base it on GNOME 41 runtime #52

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
645cb3f
io.elementary.Sdk.json: base it on GNOME 41 runtime
jjardon Jul 25, 2021
4e71a5a
Release Action: bump branch to 6.1
danirabbit Oct 28, 2021
ca8ef17
Merge branch 'main' into jjardon/gnome-40
danirabbit Oct 28, 2021
6ae5b6c
Update io.elementary.Sdk.json
danirabbit Oct 28, 2021
69994a6
Update docker.yml
danirabbit Oct 28, 2021
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
12 changes: 6 additions & 6 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
- name: daily-aarch64
packages: io.elementary.Platform/aarch64/daily io.elementary.Sdk/aarch64/daily
tags: ghcr.io/${{ github.repository }}/runtime:daily-aarch64
- name: stable-6-x86_64
packages: io.elementary.Platform/x86_64/6 io.elementary.Sdk/x86_64/6
tags: ghcr.io/${{ github.repository }}/runtime:6,ghcr.io/${{ github.repository }}/runtime:6-x86_64
- name: stable-6-aarch64
packages: io.elementary.Platform/aarch64/6 io.elementary.Sdk/aarch64/6
tags: ghcr.io/${{ github.repository }}/runtime:6-aarch64
- name: stable-6.1-x86_64
packages: io.elementary.Platform/x86_64/6.1 io.elementary.Sdk/x86_64/6
tags: ghcr.io/${{ github.repository }}/runtime:6.1,ghcr.io/${{ github.repository }}/runtime:6.1-x86_64
- name: stable-6.1-aarch64
packages: io.elementary.Platform/aarch64/6.1 io.elementary.Sdk/aarch64/6
tags: ghcr.io/${{ github.repository }}/runtime:6.1-aarch64

services:
registry:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
env:
DISPLAY: "0:0"
run: |
sudo xvfb-run --auto-servernum flatpak-builder --arch=${{ matrix.configuration.architecture }} --default-branch="6" --disable-rofiles-fuse --keep-build-dirs --install-deps-from=flathub --ccache --repo=elementary builddir ./io.elementary.Sdk.json
sudo xvfb-run --auto-servernum flatpak-builder --arch=${{ matrix.configuration.architecture }} --default-branch="6.1" --disable-rofiles-fuse --keep-build-dirs --install-deps-from=flathub --ccache --repo=elementary builddir ./io.elementary.Sdk.json

- name: Fix Permissions
run: sudo chown -R runner:docker .
Expand Down
20 changes: 1 addition & 19 deletions io.elementary.Sdk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "io.elementary.Sdk",
"id-platform": "io.elementary.Platform",
"default-branch": "daily",
"runtime-version": "3.38",
"runtime-version": "41",
"runtime": "org.gnome.Platform",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
Expand Down Expand Up @@ -127,24 +127,6 @@
}
]
},
{
"name" : "libhandy",
"buildsystem" : "meson",
"config-opts" : [
"-Dintrospection=enabled",
"-Dvapi=true",
"-Dgtk_doc=true",
"-Dtests=false",
"-Dexamples=false"
],
"sources" : [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libhandy.git",
"tag": "1.2.0"
}
]
},
{
"name" : "appdata",
"buildsystem" : "meson",
Expand Down