Skip to content

Commit

Permalink
Switch to Fedora rawhide for CI (#526)
Browse files Browse the repository at this point in the history
* Switch to Fedora rawhide for CI

1. ubuntu CI failing due to too old of a upower. When new LTS is out we can add it back.
2. rawhide will help to identify breaking changes due to new toolchains.
3. actually get CI again.

* fix: missing line char

* fix: extra install

* fix: add missing gnome-settings-daemon pkgconfig

* fix: use git instead of git-core, let's see if that let's rev-parse work

* fix: try fetch-depth 2 per actions/checkout v4 doc

* fix: swap back to v1 like the Ubuntu CI was using

* feat: implement ci meson option (off by default) to skip rev-parse

* fix: checkout

* fix: ensure submodule cloning is enabled
  • Loading branch information
JoshStrobl committed Jun 21, 2024
1 parent bc296f6 commit 21f8d61
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 10 deletions.
51 changes: 42 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,46 @@ on:
- main
- v10.9.x
jobs:
ubuntu:
runs-on: ubuntu-22.04
fedora:
runs-on: ubuntu-latest
container: "registry.fedoraproject.org/fedora:rawhide"
steps:
- uses: actions/checkout@v1
- run: sudo add-apt-repository ppa:xubuntu-dev/experimental
- run: sudo apt update
- run: sudo apt remove libunwind-14-dev
- run: sudo apt install meson ninja-build zenity gnome-screensaver gnome-settings-daemon-dev gtk-doc-tools intltool libaccountsservice-dev libasound2-dev libcanberra-dev libcanberra-gtk3-dev libgee-0.8-dev libgnome-bluetooth-dev libgnome-desktop-3-dev libgnome-menu-3-dev libgtk-3-dev libibus-1.0-dev libmutter-10-dev libpeas-dev libpolkit-agent-1-dev libpulse-dev libupower-glib-dev libwnck-3-dev sassc uuid-dev valac libgstreamer1.0-dev libgee-0.8-dev libxfce4windowing-0-dev
- run: meson build -Duse-old-zenity=true -Dwith-gnome-screensaver=true
- run: meson compile -C build
- name: Install prerequisites
run: |
dnf install --assumeyes \
'pkgconfig(accountsservice)' \
'pkgconfig(alsa)' \
'pkgconfig(gee-0.8)' \
'pkgconfig(gnome-desktop-3.0)' \
'pkgconfig(gnome-settings-daemon)' \
'pkgconfig(gstreamer-1.0)' \
'pkgconfig(ibus-1.0)' \
'pkgconfig(libcanberra)' \
'pkgconfig(libnotify)' \
'pkgconfig(libpeas-1.0)' \
'pkgconfig(libpulse)' \
'pkgconfig(libwnck-3.0)' \
'pkgconfig(libxfce4windowing-0)' \
'pkgconfig(polkit-agent-1)' \
'pkgconfig(upower-glib)' \
'pkgconfig(uuid)' \
'pkgconfig(vapigen)' \
budgie-desktop-view \
budgie-screensaver \
desktop-file-utils \
gcc \
gettext \
git \
gtk-doc \
intltool \
magpie-devel \
meson \
sassc \
zenity
- uses: actions/checkout@v3
with:
submodules: true
- name: Build Budgie Desktop
run: |
meson build -Dci=true
meson compile -C build
3 changes: 2 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ cdata = configuration_data()
# Inspired by https://github.com/GNOME/recipes/blob/master/meson.build
package_version = meson.project_version()

if fs.exists('.git')
ci = get_option('ci')
if fs.exists('.git') and ci == false
git = find_program('git')
git_version = run_command('git', ['rev-parse', 'HEAD'], check: true)
package_version += ' (git-'+git_version.stdout().strip()+')'
Expand Down
1 change: 1 addition & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
option('ci', type: 'boolean', value: false, description: 'Continuous Integration flag (internal use only)')
option('use-old-zenity', type: 'boolean', value: false, description: 'Use old zenity CLI API for out-of-process dialog handling')
option('with-bluetooth', type: 'boolean', value: true, description: 'Enable Bluetooth (Vala option)')
option('with-gnome-screensaver', type: 'boolean', value: false, description: 'Build using gnome-screensaver as a dependency')
Expand Down

0 comments on commit 21f8d61

Please sign in to comment.