Skip to content
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

feat: GNOME 47 #111

Merged
merged 5 commits into from
Sep 18, 2024
Merged

feat: GNOME 47 #111

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
f7d7e82
refactor: drop elementary image
andyholmes Sep 15, 2024
be714b2
feat: bump freedesktop.org runtimes
andyholmes Sep 15, 2024
ec0aef4
feat: bump GNOME runtimes
andyholmes Sep 15, 2024
0af00e7
refactor: migrate REUSE config
andyholmes Sep 15, 2024
41e5f7a
chore: cleanup base containerfile
andyholmes Sep 15, 2024
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
100 changes: 56 additions & 44 deletions .github/workflows/cr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ jobs:
#
# These are images for the freedesktop.org runtime, and those that
# add a few packages to support additional languages and so on.
- name: freedesktop
tag: 22.08
flathub: >
org.freedesktop.Platform/x86_64/22.08
org.freedesktop.Sdk/x86_64/22.08
org.freedesktop.Platform/aarch64/22.08
org.freedesktop.Sdk/aarch64/22.08

- name: freedesktop
tag: 23.08
flathub: >
Expand All @@ -48,6 +40,14 @@ jobs:
org.freedesktop.Platform/aarch64/23.08
org.freedesktop.Sdk/aarch64/23.08

- name: freedesktop
tag: 24.08
flathub: >
org.freedesktop.Platform/x86_64/24.08
org.freedesktop.Sdk/x86_64/24.08
org.freedesktop.Platform/aarch64/24.08
org.freedesktop.Sdk/aarch64/24.08

- name: rust
tag: 23.08
flathub: >
Expand All @@ -61,36 +61,21 @@ jobs:
org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08

- name: rust
tag: nightly
tag: 24.08
flathub: >
org.freedesktop.Platform/x86_64/23.08
org.freedesktop.Sdk/x86_64/23.08
org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08
org.freedesktop.Sdk.Extension.rust-nightly/x86_64/23.08

# elementaryOS
#
# These are images for the elementaryOS runtime. The maintainer
# doesn't use these, but feel free to open a PR if out-of-date.
- name: elementary
tag: juno-22.08
flathub: >
io.elementary.BaseApp//juno-22.08
org.freedesktop.Platform//22.08
org.freedesktop.Sdk//22.08
org.freedesktop.Platform/x86_64/24.08
org.freedesktop.Sdk/x86_64/24.08
org.freedesktop.Platform/aarch64/24.08
org.freedesktop.Sdk/aarch64/24.08
org.freedesktop.Sdk.Extension.llvm18/x86_64/24.08
org.freedesktop.Sdk.Extension.rust-stable/x86_64/24.08
org.freedesktop.Sdk.Extension.llvm18/aarch64/24.08
org.freedesktop.Sdk.Extension.rust-stable/aarch64/24.08

# GNOME
#
# These are images for the GNOME runtime, and those that add a few
# things for e.g. Rust bindings.
- name: gnome
tag: 45
flathub: >
org.gnome.Platform/x86_64/45
org.gnome.Sdk/x86_64/45
org.gnome.Platform/aarch64/45
org.gnome.Sdk/aarch64/45

- name: gnome
tag: 46
flathub: >
Expand All @@ -99,6 +84,14 @@ jobs:
org.gnome.Platform/aarch64/46
org.gnome.Sdk/aarch64/46

- name: gnome
tag: 47
flathub: >
org.gnome.Platform/x86_64/47
org.gnome.Sdk/x86_64/47
org.gnome.Platform/aarch64/47
org.gnome.Sdk/aarch64/47

- name: gnome
tag: master
gnome_nightly: >
Expand All @@ -107,18 +100,6 @@ jobs:
org.gnome.Platform/aarch64/master
org.gnome.Sdk/aarch64/master

- name: gnome-rust
tag: 45
flathub: >
org.gnome.Platform/x86_64/45
org.gnome.Sdk/x86_64/45
org.gnome.Platform/aarch64/45
org.gnome.Sdk/aarch64/45
org.freedesktop.Sdk.Extension.llvm17/x86_64/23.08
org.freedesktop.Sdk.Extension.rust-stable/x86_64/23.08
org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08
org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08

- name: gnome-rust
tag: 46
flathub: >
Expand All @@ -131,6 +112,18 @@ jobs:
org.freedesktop.Sdk.Extension.llvm17/aarch64/23.08
org.freedesktop.Sdk.Extension.rust-stable/aarch64/23.08

- name: gnome-rust
tag: 47
flathub: >
org.gnome.Platform/x86_64/47
org.gnome.Sdk/x86_64/47
org.gnome.Platform/aarch64/47
org.gnome.Sdk/aarch64/47
org.freedesktop.Sdk.Extension.llvm18/x86_64/24.08
org.freedesktop.Sdk.Extension.rust-stable/x86_64/24.08
org.freedesktop.Sdk.Extension.llvm18/aarch64/24.08
org.freedesktop.Sdk.Extension.rust-stable/aarch64/24.08

- name: gnome-typescript
tag: 46
flathub: >
Expand All @@ -141,6 +134,16 @@ jobs:
org.freedesktop.Sdk.Extension.node18/x86_64/23.08
org.freedesktop.Sdk.Extension.typescript/x86_64/23.08

- name: gnome-typescript
tag: 47
flathub: >
org.gnome.Platform/x86_64/47
org.gnome.Sdk/x86_64/47
org.gnome.Platform/aarch64/47
org.gnome.Sdk/aarch64/47
org.freedesktop.Sdk.Extension.node20/x86_64/24.08
org.freedesktop.Sdk.Extension.typescript/x86_64/24.08

- name: gnome-vala
tag: 46
flathub: >
Expand All @@ -150,6 +153,15 @@ jobs:
org.gnome.Sdk/aarch64/46
org.freedesktop.Sdk.Extension.vala/x86_64/23.08

- name: gnome-vala
tag: 47
flathub: >
org.gnome.Platform/x86_64/47
org.gnome.Sdk/x86_64/47
org.gnome.Platform/aarch64/47
org.gnome.Sdk/aarch64/47
org.freedesktop.Sdk.Extension.vala/x86_64/24.08

# Workbench
#
# This is a special image for Workbench, that includes quite a few
Expand Down
10 changes: 0 additions & 10 deletions .reuse/dep5
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,14 @@ FROM registry.fedoraproject.org/fedora:latest

# Notes:
# - docker: docker/setup-qemu-action
# - flatpak-builder: Backport fix for flatpak/flatpak-builder#495
# - python3-*: flatpak/flatpak-external-data-checker
# - rsync: JamesIves/github-pages-deploy-action
# - zstd: actions/cache
RUN dnf install -y 'dnf-command(copr)' && \
dnf copr -y enable andyholmes/main && \
dnf install -y ccache \
dbus-daemon \
RUN dnf install -y ccache flatpak flatpak-builder git git-lfs \
dbus-daemon xorg-x11-server-Xvfb \
docker \
flatpak \
flatpak-builder \
git \
git-lfs \
python3-{aiohttp,apt,editorconfig,github,gobject,jsonschema,lxml,magic,packaging,pyelftools,ruamel-yaml,semver,toml} \
rsync \
xorg-x11-server-Xvfb \
zstd && \
dnf clean all && rm -rf /var/cache/dnf

Expand Down
16 changes: 16 additions & 0 deletions REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: No rights reserved

version = 1

[[annotations]]
path = [".eslintrc.json", ".github/**", ".gitignore", "tests/**", "README.md"]
precedence = "aggregate"
SPDX-FileCopyrightText = "No rights reserved"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = ["dist/**", "package.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Andy Holmes <[email protected]>"
SPDX-License-Identifier = "GPL-3.0-or-later"
Loading