Skip to content

Commit

Permalink
Merge pull request #28 from regolith-linux/chore-3_1-release
Browse files Browse the repository at this point in the history
chore: update build system to generate release 3.1.  Cleanup older re…
  • Loading branch information
kgilmer authored Feb 10, 2024
2 parents 6a44e52 + 5a2b89c commit 8778086
Show file tree
Hide file tree
Showing 10 changed files with 412 additions and 27 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/build-deb-v4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.host-os }}
strategy:
matrix:
stage: [experimental, unstable, testing, release-3_0] #, release-2_2, release-2_1]
stage: [experimental, unstable, testing, release-3_1 ] # release-3_0, release-2_2, release-2_1]
distro-codename: [
ubuntu-focal-amd64,
ubuntu-focal-arm64,
Expand All @@ -28,14 +28,10 @@ jobs:
debian-testing-arm64
]
exclude:
- stage: release-3_0
- stage: release-3_1
distro-codename: debian-testing-amd64 # debian testing is never released
- stage: release-3_0
- stage: release-3_1
distro-codename: debian-testing-arm64 # debian testing is never released
- stage: release-3_0
distro-codename: ubuntu-mantic-amd64
- stage: release-3_0
distro-codename: ubuntu-mantic-arm64
include:
- distro-codename: ubuntu-focal-amd64
host-os: ubuntu-20.04
Expand Down
36 changes: 36 additions & 0 deletions stage/release-3_1/debian/bookworm/package-model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"packages": {
"regolith-desktop": {
"source": "https://github.com/regolith-linux/regolith-desktop.git",
"ref": "r3_1-debian-bullseye"
},
"ilia": {
"source": "https://github.com/regolith-linux/ilia.git",
"ref": "r3_1-ubuntu-jammy"
},
"lago": {
"source": "https://github.com/regolith-linux/lago.git",
"ref": "r3_1-ubuntu-jammy"
},
"regolith-control-center": {
"source": "https://github.com/regolith-linux/regolith-control-center.git",
"ref": "r3_1-debian-bookworm"
},
"childe": {
"source": "https://github.com/regolith-linux/childe.git",
"ref": "r3_1-debian-bookworm"
},
"ubiquity-slideshow-regolith": null,
"plymouth-theme-regolith": null,
"i3status-rs": null,
"regolith-displayd": null,
"regolith-inputd": null,
"trawl": null,
"libtrawldb": null,
"sway-regolith": null,
"regolith-avizo": null,
"gtklock": null,
"regolith-powerd": null,
"sway-audio-idle-inhibit": null
}
}
6 changes: 6 additions & 0 deletions stage/release-3_1/debian/bullseye/amd64/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

# This PPA adds nececessary backports for debbuild helper 13
sudo apt install -y software-properties-common

sudo add-apt-repository --remove -y ppa:videolan/master-daily || true
26 changes: 26 additions & 0 deletions stage/release-3_1/debian/bullseye/package-model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"packages": {
"regolith-desktop": {
"source": "https://github.com/regolith-linux/regolith-desktop.git",
"ref": "r3_1-debian-bullseye"
},
"xcb-util": {
"source": "https://git.launchpad.net/ubuntu/+source/xcb-util",
"ref": "applied/ubuntu/groovy"
},
"regolith-control-center": {
"source": "https://github.com/regolith-linux/regolith-control-center.git",
"ref": "r3_1-debian-bullseye"
},
"i3status-rs": null,
"regolith-displayd": null,
"regolith-inputd": null,
"trawl": null,
"libtrawldb": null,
"sway-regolith": null,
"regolith-avizo": null,
"gtklock": null,
"regolith-powerd": null,
"sway-audio-idle-inhibit": null
}
}
46 changes: 46 additions & 0 deletions stage/release-3_1/debian/testing/package-model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"packages": {
"regolith-desktop": {
"source": "https://github.com/regolith-linux/regolith-desktop.git",
"ref": "r3_1-debian-bullseye"
},
"ilia": {
"source": "https://github.com/regolith-linux/ilia.git",
"ref": "r3_1-ubuntu-jammy"
},
"lago": {
"source": "https://github.com/regolith-linux/lago.git",
"ref": "r3_1-ubuntu-jammy"
},
"regolith-control-center": {
"source": "https://github.com/regolith-linux/regolith-control-center.git",
"ref": "r3_1-debian-bookworm"
},
"sway-audio-idle-inhibit": {
"source": "https://github.com/regolith-linux/SwayAudioIdleInhibit.git",
"ref": "r3_1-debian-testing"
},
"gtklock": {
"source": "https://github.com/regolith-linux/gtklock.git",
"ref": "r3_1-ubuntu-jammy"
},
"i3status-rs": {
"source": "https://github.com/regolith-linux/i3status-rs_debian.git",
"ref": "r3_1"
},
"sway-regolith": {
"source": "https://github.com/regolith-linux/sway-regolith.git",
"ref": "r3_1"
},
"childe": {
"source": "https://github.com/regolith-linux/childe.git",
"ref": "r3_1-debian-bookworm"
},
"regolith-powerd": {
"source": "https://github.com/regolith-linux/regolith-powerd.git",
"ref": "r3_1-debian-bookworm"
},
"ubiquity-slideshow-regolith": null,
"plymouth-theme-regolith": null
}
}
212 changes: 212 additions & 0 deletions stage/release-3_1/package-model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
{
"packages": {
"regolith-system-ubuntu": {
"source": "https://github.com/regolith-linux/regolith-system-ubuntu.git",
"ref": "r3_1"
},
"regolith-lightdm-config": {
"source": "https://github.com/regolith-linux/regolith-lightdm-config.git",
"ref": "r3_1"
},
"regolith-session": {
"source": "https://github.com/regolith-linux/regolith-session.git",
"ref": "r3_1"
},
"i3-snapshot": {
"source": "https://github.com/regolith-linux/i3-snapshot.git",
"ref": "r3_1"
},
"python3-i3ipc": {
"source": "https://github.com/regolith-linux/python3-i3ipc",
"ref": "r3_1"
},
"fonts-jetbrains-mono": {
"source": "https://github.com/regolith-linux/fonts-jetbrains-mono.git",
"ref": "r3_1"
},
"fonts-materialdesignicons-webfont": {
"source": "https://github.com/regolith-linux/fonts-materialdesignicons-webfont.git",
"ref": "r3_1"
},
"i3-wm": {
"source": "https://github.com/regolith-linux/i3-wm.git",
"ref": "r3_1"
},
"ayu-theme": {
"source": "https://github.com/regolith-linux/ayu-theme.git",
"ref": "r3_1"
},
"solarc-theme": {
"source": "https://github.com/regolith-linux/solarc-theme.git",
"ref": "r3_1"
},
"gruvbox-gtk": {
"source": "https://github.com/regolith-linux/gruvbox-gtk.git",
"ref": "r3_1"
},
"dracula-gtk": {
"source": "https://github.com/regolith-linux/dracula-gtk.git",
"ref": "r3_1"
},
"whitesur-gtk-theme": {
"source": "https://github.com/regolith-linux/whitesur-gtk-theme.git",
"ref": "r3_1"
},
"regolith-look-default": {
"source": "https://github.com/regolith-linux/regolith-look-default.git",
"ref": "r3_1"
},
"regolith-look-extra": {
"source": "https://github.com/regolith-linux/regolith-look-extra.git",
"ref": "r3_1"
},
"i3-next-workspace": {
"source": "https://github.com/regolith-linux/i3-next-workspace.git",
"ref": "r3_1"
},
"i3-swap-focus": {
"source": "https://github.com/regolith-linux/i3-swap-focus.git",
"ref": "r3_1"
},
"i3xrocks": {
"source": "https://github.com/regolith-linux/i3xrocks.git",
"ref": "r3_1"
},
"regolith-i3xrocks-config": {
"source": "https://github.com/regolith-linux/regolith-i3xrocks-config.git",
"ref": "r3_1"
},
"regolith-desktop": {
"source": "https://github.com/regolith-linux/regolith-desktop.git",
"ref": "r3_1"
},
"regolith-ftue": {
"source": "https://github.com/regolith-linux/regolith-ftue.git",
"ref": "r3_1"
},
"regolith-compositor-none": {
"source": "https://github.com/regolith-linux/regolith-compositor-none.git",
"ref": "r3_1"
},
"regolith-compositor-xcompmgr": {
"source": "https://github.com/regolith-linux/regolith-compositor-xcompmgr.git",
"ref": "r3_1"
},
"regolith-compositor-compton-glx": {
"source": "https://github.com/regolith-linux/regolith-compositor-compton-glx.git",
"ref": "r3_1"
},
"picom": {
"source": "https://github.com/regolith-linux/picom.git",
"ref": "r3_1"
},
"regolith-compositor-picom-glx": {
"source": "https://github.com/regolith-linux/regolith-compositor-picom-glx.git",
"ref": "r3_1"
},
"remontoire": {
"source": "https://github.com/regolith-linux/remontoire.git",
"ref": "r3_1"
},
"ilia": {
"source": "https://github.com/regolith-linux/ilia.git",
"ref": "r3_1"
},
"lago": {
"source": "https://github.com/regolith-linux/lago.git",
"ref": "r3_1"
},
"regolith-rofi-config": {
"source": "https://github.com/regolith-linux/regolith-rofi-config.git",
"ref": "r3_1"
},
"regolith-rofication": {
"source": "https://github.com/regolith-linux/regolith-rofication.git",
"ref": "r3_1"
},
"regolith-control-center": {
"source": "https://github.com/regolith-linux/regolith-control-center.git",
"ref": "r3_1"
},
"regolith-default-settings": {
"source": "https://github.com/regolith-linux/regolith-default-settings.git",
"ref": "r3_1"
},
"plymouth-theme-regolith": {
"source": "https://github.com/regolith-linux/plymouth-theme-regolith.git",
"ref": "r3_1"
},
"regolith-distro-ubuntu": {
"source": "https://github.com/regolith-linux/regolith-distro-ubuntu.git",
"ref": "r3_1"
},
"xrescat": {
"source": "https://github.com/regolith-linux/xrescat.git",
"ref": "r3_1"
},
"regolith-unclutter-xfixes": {
"source": "https://github.com/regolith-linux/regolith-unclutter-xfixes.git",
"ref": "r3_1"
},
"arc-icon-theme": {
"source": "https://github.com/regolith-linux/arc-icon-theme.git",
"ref": "r3_1"
},
"nordic": {
"source": "https://github.com/regolith-linux/nordic.git",
"ref": "r3_1"
},
"fonts-source-code-pro-ttf": {
"source": "https://github.com/regolith-linux/fonts-source-code-pro-ttf.git",
"ref": "r3_1"
},
"fonts-nerd-fonts": {
"source": "https://github.com/regolith-linux/fonts-nerd-fonts.git",
"ref": "r3_1"
},
"regolith-wm-config": {
"source": "https://github.com/regolith-linux/regolith-wm-config.git",
"ref": "r3_1"
},
"i3status-rs": {
"source": "https://github.com/regolith-linux/i3status-rs_debian.git",
"ref": "r3_1"
},
"regolith-displayd": {
"source": "https://github.com/regolith-linux/regolith-displayd.git",
"ref": "r3_1"
},
"regolith-inputd": {
"source": "https://github.com/regolith-linux/regolith-inputd.git",
"ref": "r3_1"
},
"trawl": {
"source": "https://github.com/regolith-linux/trawl.git",
"ref": "r3_1"
},
"libtrawldb": {
"source": "https://github.com/regolith-linux/libtrawldb.git",
"ref": "r3_1"
},
"sway-regolith": {
"source": "https://github.com/regolith-linux/sway-regolith.git",
"ref": "r3_1"
},
"regolith-avizo": {
"source": "https://github.com/regolith-linux/avizo.git",
"ref": "r3_1"
},
"gtklock": {
"source": "https://github.com/regolith-linux/gtklock.git",
"ref": "r3_1"
},
"regolith-powerd": {
"source": "https://github.com/regolith-linux/regolith-powerd.git",
"ref": "r3_1"
},
"sway-audio-idle-inhibit": {
"source": "https://github.com/regolith-linux/SwayAudioIdleInhibit.git",
"ref": "r3_1"
}
}
}
14 changes: 14 additions & 0 deletions stage/release-3_1/ubuntu/focal/package-model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"packages": {
"i3status-rs": null,
"regolith-displayd": null,
"regolith-inputd": null,
"trawl": null,
"libtrawldb": null,
"sway-regolith": null,
"regolith-avizo": null,
"gtklock": null,
"regolith-powerd": null,
"sway-audio-idle-inhibit": null
}
}
Loading

0 comments on commit 8778086

Please sign in to comment.