Skip to content

Commit

Permalink
Merge pull request #55 from regolith-linux/manifests
Browse files Browse the repository at this point in the history
feat: track manifests in repo instead of external server
  • Loading branch information
kgilmer authored Jan 18, 2025
2 parents 82ecbb2 + 8f91b73 commit e625cbb
Show file tree
Hide file tree
Showing 44 changed files with 1,606 additions and 7 deletions.
65 changes: 58 additions & 7 deletions .github/workflows/build-deb-v4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ jobs:
- name: Pull Manifest
run: |
set -e
wget -P "${{ steps.init.outputs.manifest-path }}" "http://archive.regolith-desktop.com/manifests/${{ steps.init.outputs.distro }}/${{ steps.init.outputs.codename }}/${{ steps.init.outputs.suite }}-${{ steps.init.outputs.component }}/${{ steps.init.outputs.arch }}/manifest.txt" || true
cp "${{ steps.init.outputs.manifest-path }}/${{ steps.init.outputs.distro }}/${{ steps.init.outputs.codename }}/${{ steps.init.outputs.suite }}-${{ steps.init.outputs.component }}/manifest.txt" ${{ steps.init.outputs.manifest-path }} || true
echo "Current manifest:"
cat ${{ steps.init.outputs.manifest-path }}/manifest.txt || true
Expand Down Expand Up @@ -281,6 +281,8 @@ jobs:
exit 1
fi
mv ${{ steps.init.outputs.manifest-path }}/manifest.txt ${{ steps.init.outputs.manifest-path }}/${{ steps.init.outputs.distro }}_${{ steps.init.outputs.codename }}_${{ steps.init.outputs.suite }}-${{ steps.init.outputs.component }}_manifest.txt
cat ${{ steps.init.outputs.changelogs-path }}/CHANGELOG_${{ steps.init.outputs.target }}.raw.txt | grep ^CHLOG: | cut -c 7- > ${{ steps.init.outputs.changelogs-path }}/CHANGELOG_${{ steps.init.outputs.target }}.txt
cat ${{ steps.init.outputs.changelogs-path }}/CHANGELOG_${{ steps.init.outputs.target }}.raw.txt | grep ^SRCLOG: | cut -c 8- > ${{ steps.init.outputs.changelogs-path }}/SOURCELOG_${{ steps.init.outputs.target }}.txt
Expand Down Expand Up @@ -309,7 +311,6 @@ jobs:
done
rsync --ignore-missing-args ${{ steps.init.outputs.changelogs-path }}/SOURCELOG_${{ steps.init.outputs.target }}.txt root@${{ secrets.KAMATERA_HOSTNAME2 }}:/opt/archives/workspace/
rsync --mkpath ${{ steps.init.outputs.manifest-path }}/manifest.txt root@${{ secrets.KAMATERA_HOSTNAME2 }}:/opt/archives/manifests/${{ steps.init.outputs.distro }}/${{ steps.init.outputs.codename }}/${{ steps.init.outputs.suite }}-${{ steps.init.outputs.component }}/${{ steps.init.outputs.arch }}/
- name: Log Build Output
if: steps.changes.outputs.changed == 1
Expand All @@ -318,13 +319,63 @@ jobs:
echo "package-publish-path:"
find ${{ steps.init.outputs.package-publish-path }}
- name: Upload Artifacts
- name: Upload Manifests
uses: actions/upload-artifact@v4
if: steps.changes.outputs.changed == 1
with:
name: MANIFESTS_${{ steps.init.outputs.target }}
path: "${{ steps.init.outputs.manifest-path }}/*_manifest.txt"

- name: Upload Changelogs
uses: actions/upload-artifact@v4
if: steps.changes.outputs.changed == 1
with:
name: CHANGELOG_${{ steps.init.outputs.target }}
path: ${{ steps.init.outputs.changelogs-path }}/*${{ steps.init.outputs.target }}.txt

# update manifests
manifests:
runs-on: ubuntu-24.04
needs: build
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Download Artifacts
uses: actions/download-artifact@v4
with:
path: manifests
pattern: MANIFESTS_*
merge-multiple: true

- name: Check Manifests
run: |
for file in manifests/*_manifest.txt; do
if [ ! -f "$$file" ]; then
continue
fi
filename="$(basename $file)"
distro="$(echo $filename | cut -d"_" -f1)"
codename="$(echo $filename | cut -d"_" -f2)"
suite="$(echo $filename | cut -d"_" -f3)"
name="$(echo $filename | cut -d"_" -f4)"
mkdir -p manifests/$distro/$codename/$suite/
mv $file manifests/$distro/$codename/$suite/$name
done
- name: Push Manifest Changes
uses: stefanzweifel/git-auto-commit-action@v5
env:
GITHUB_TOKEN: ${{ secrets.ORG_BROADCAST_TOKEN }}
with:
file_pattern: "*"
commit_message: "chore: update ${{ inputs.stage }} manifest for all packages"
commit_user_name: regolith-bot
commit_user_email: [email protected]
commit_author: "regolith-bot <[email protected]>"

# calculate changelogs
changelogs:
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -360,7 +411,7 @@ jobs:
# rebuild sources
source:
needs: changelogs
needs: [manifests, changelogs]
if: ${{ !failure() && !cancelled() && needs.changelogs.outputs.source-changed != 0 }}
uses: ./.github/workflows/rebuild-sources.yml
with:
Expand All @@ -370,7 +421,7 @@ jobs:

# publish archives
publish:
needs: [changelogs, source]
needs: [manifests, changelogs, source]
if: ${{ !failure() && !cancelled() && needs.changelogs.outputs.package-changed != 0 }}
uses: ./.github/workflows/publish-packages.yml
with:
Expand All @@ -380,7 +431,7 @@ jobs:
# create a release with changlogs
release:
runs-on: ubuntu-24.04
needs: [changelogs, publish]
needs: [manifests, changelogs, publish]
if: ${{ !failure() && !cancelled() && needs.changelogs.outputs.package-changed != 0 }}
steps:
- name: Download Artifacts
Expand All @@ -407,7 +458,7 @@ jobs:
# run the tests
test:
needs: [changelogs, release]
needs: [manifests, changelogs, release]
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/test-desktop-installable2.yml
with:
Expand Down
2 changes: 2 additions & 0 deletions manifests/debian/bookworm/experimental-main/manifest.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
picom https://github.com/regolith-linux/picom.git packaging/v11-regolith 64b4789dffeb384a89a2372888180578e1199465
xrescat https://github.com/regolith-linux/xrescat.git experimental f49e71592b430e0705ab0ff47585cbde42f3af6c
51 changes: 51 additions & 0 deletions manifests/debian/bookworm/stable-3.0/manifest.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
arc-icon-theme https://github.com/regolith-linux/arc-icon-theme.git r3_0 58b53b320b09c26c1569b667409c42749613b39e
ayu-theme https://github.com/regolith-linux/ayu-theme.git r3_0 ac812de190d0305ecd6d8871c772631592ad3608
dracula-gtk https://github.com/regolith-linux/dracula-gtk.git r3_0 a245139bf322047fd5427ab1e4fb67497b1f6c3a
fonts-jetbrains-mono https://github.com/regolith-linux/fonts-jetbrains-mono.git r3_0 6fe0e7660dc347d340cee83bd63654ce0cf48beb
fonts-materialdesignicons-webfont https://github.com/regolith-linux/fonts-materialdesignicons-webfont.git r3_0 72e4dfc4a6d658b315cabcfd68e2635466652f69
fonts-nerd-fonts https://github.com/regolith-linux/fonts-nerd-fonts.git r3_0 451682a3c8386e8dd6c44e61be3d87e4774dae6a
fonts-source-code-pro-ttf https://github.com/regolith-linux/fonts-source-code-pro-ttf.git r3_0 2fd5dfd1156202803deedc18bd1286f200514694
gruvbox-gtk https://github.com/regolith-linux/gruvbox-gtk.git r3_0 f09fa51546f66e37dc49fc9869a30eaa50ee203e
gtklock https://github.com/regolith-linux/gtklock.git r3_0 97397aad732464bcb61f89526d821b492f9180ee
i3-next-workspace https://github.com/regolith-linux/i3-next-workspace.git r3_0 f2758efeb6d2d9aa358a43149bff9671b328f8b3
i3-snapshot https://github.com/regolith-linux/i3-snapshot.git r3_0 5135c860ef4ebd02ef31e5116502ca8d69f392d3
i3-swap-focus https://github.com/regolith-linux/i3-swap-focus.git r3_0 c04ad138b8863575830315e3f58eb3f1c9cf792c
i3-wm https://github.com/regolith-linux/i3-wm.git r3_0 30cdbc5da7e904d370a715cf7ff78092e30360eb
i3status-rs https://github.com/regolith-linux/i3status-rs_debian.git r3_0 cb841b32e61bb87574f2001e42df942508f85f5a
i3xrocks https://github.com/regolith-linux/i3xrocks.git r3_0 0c39c518e5e0909268865d5b0d77c1fb9bf74d22
ilia https://github.com/regolith-linux/ilia.git r3_0-ubuntu-jammy 666a292a96f5830ff69d0f5f7cd063e6b8c5ffeb
lago https://github.com/regolith-linux/lago.git r3_0-ubuntu-jammy e73215d6f8e00f6d2fad92a2e70254a8f79fae06
libtrawldb https://github.com/regolith-linux/libtrawldb.git r3_0 3b0c79c299379cfc454b33f70df2eba53629de86
nordic https://github.com/regolith-linux/nordic.git r3_0 0c7b9afcf83aa0eb9a267a52da0e8301a7e6484c
picom https://github.com/regolith-linux/picom.git r3_0 3f5e284bb3d0f5fcac105cfb5958c2c94e531042
python3-i3ipc https://github.com/regolith-linux/python3-i3ipc r3_0 4d166018e305c92220d7e4c6024bc9b0df5332ec
regolith-avizo https://github.com/regolith-linux/avizo.git r3_0 c54a9d09de86662219ecbf86246bd7e26e7e09da
regolith-compositor-compton-glx https://github.com/regolith-linux/regolith-compositor-compton-glx.git r3_0 d384a6d692e097fe3a0cc0e3c9460b787092ac0f
regolith-compositor-none https://github.com/regolith-linux/regolith-compositor-none.git r3_0 23916535a412e62610c92b69099a3eb6da64d524
regolith-compositor-picom-glx https://github.com/regolith-linux/regolith-compositor-picom-glx.git r3_0 dd198bb2563fec6102906bd15dd8db5f2cc4e5d1
regolith-compositor-xcompmgr https://github.com/regolith-linux/regolith-compositor-xcompmgr.git r3_0 1b3d09211597a78c55b6cc49754a4f7de3b8b53f
regolith-control-center https://github.com/regolith-linux/regolith-control-center.git r3_0-debian-bookworm cd5a9200de9a2736b6e13964ce2d34fcf711e6a8
regolith-default-settings https://github.com/regolith-linux/regolith-default-settings.git r3_0 0de5d8fb42f5331268b3bfe126e21b443bf2a00d
regolith-desktop https://github.com/regolith-linux/regolith-desktop.git r3_0-debian-bullseye 51473f9f5591cf37416da305fa314924e11c1739
regolith-displayd https://github.com/regolith-linux/regolith-displayd.git r3_0 daf795bc1684571abed26da4baa67e06f42ae130
regolith-distro-ubuntu https://github.com/regolith-linux/regolith-distro-ubuntu.git r3_0 fe6cc85e2be19b83ec046975d9c6685f11d80bfb
regolith-ftue https://github.com/regolith-linux/regolith-ftue.git r3_0 205178b3046cbc73ec42cd81b5b24bca5ff13fa4
regolith-i3xrocks-config https://github.com/regolith-linux/regolith-i3xrocks-config.git r3_0 3eed9dad91134b910202795cc5068ebf03f7cbec
regolith-inputd https://github.com/regolith-linux/regolith-inputd.git r3_0 7229c7aba79fd63b8672321df7f08c2ecbe04610
regolith-lightdm-config https://github.com/regolith-linux/regolith-lightdm-config.git r3_0 4d59d1f83d9371836eb76b88a7f3f6fb0fde7d27
regolith-look-default https://github.com/regolith-linux/regolith-look-default.git r3_0 286e055f0710cbd5cab8732200bc3441771be99f
regolith-look-extra https://github.com/regolith-linux/regolith-look-extra.git r3_0 259d82c08fcc302c8ed1571f4fb0a0e39a294c97
regolith-powerd https://github.com/regolith-linux/regolith-powerd.git r3_0 ca281fcfe9f927756790d4ca11e9dea4c5488cee
regolith-rofi-config https://github.com/regolith-linux/regolith-rofi-config.git r3_0 80f26989a20e0952108c3301f7a3a7af92764208
regolith-rofication https://github.com/regolith-linux/regolith-rofication.git r3_0 ba61e7b58f02304d6ec579d9966b656a5916d698
regolith-session https://github.com/regolith-linux/regolith-session.git r3_0 ba191ca2652d656e70e25421818ab65a840afbf7
regolith-system-ubuntu https://github.com/regolith-linux/regolith-system-ubuntu.git r3_0 7add3c37e39911f403e8273348d530c5afd89c6c
regolith-unclutter-xfixes https://github.com/regolith-linux/regolith-unclutter-xfixes.git r3_0 e4bbaba2f98595370ca85283f82d7b7f6c501bba
regolith-wm-config https://github.com/regolith-linux/regolith-wm-config.git r3_0 ca0d7a679d3cfa11a759821f8ead49de2c74dd02
remontoire https://github.com/regolith-linux/remontoire.git r3_0 68d562c78d6e0094ca744bd7161c308f583e93e4
solarc-theme https://github.com/regolith-linux/solarc-theme.git r3_0 28e36db017d6892f08b437e03beeee285a9d50f2
sway-audio-idle-inhibit https://github.com/regolith-linux/SwayAudioIdleInhibit.git r3_0 03a7cc78c6270b08d5235a6dbe2f8e8b481e9865
sway-regolith https://github.com/regolith-linux/sway-regolith.git r3_0 395c0d2cc24923757da1867cdaa195756d2b6fbb
trawl https://github.com/regolith-linux/trawl.git r3_0 1a0e663757861469babc21ad5372932d5b182d7c
whitesur-gtk-theme https://github.com/regolith-linux/whitesur-gtk-theme.git r3_0 ade54f53eac3af39a6ae98e984c766185419c9a7
xrescat https://github.com/regolith-linux/xrescat.git r3_0 e8e261441682244112b2020e2ad102768e6ba3fd
42 changes: 42 additions & 0 deletions manifests/debian/bookworm/stable-3.1/manifest.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
arc-icon-theme https://github.com/regolith-linux/arc-icon-theme.git r3_1 58b53b320b09c26c1569b667409c42749613b39e
ayu-theme https://github.com/regolith-linux/ayu-theme.git r3_1 ac812de190d0305ecd6d8871c772631592ad3608
childe https://github.com/regolith-linux/childe.git r3_1-debian-bookworm 965e65d046382232771ad8a6a1d5b61408498fae
dracula-gtk https://github.com/regolith-linux/dracula-gtk.git r3_1 a245139bf322047fd5427ab1e4fb67497b1f6c3a
fonts-jetbrains-mono https://github.com/regolith-linux/fonts-jetbrains-mono.git r3_1 6fe0e7660dc347d340cee83bd63654ce0cf48beb
fonts-materialdesignicons-webfont https://github.com/regolith-linux/fonts-materialdesignicons-webfont.git r3_1 72e4dfc4a6d658b315cabcfd68e2635466652f69
fonts-nerd-fonts https://github.com/regolith-linux/fonts-nerd-fonts.git r3_1 451682a3c8386e8dd6c44e61be3d87e4774dae6a
fonts-source-code-pro-ttf https://github.com/regolith-linux/fonts-source-code-pro-ttf.git r3_1 2fd5dfd1156202803deedc18bd1286f200514694
gruvbox-gtk https://github.com/regolith-linux/gruvbox-gtk.git r3_1 f09fa51546f66e37dc49fc9869a30eaa50ee203e
i3-next-workspace https://github.com/regolith-linux/i3-next-workspace.git r3_1 f2758efeb6d2d9aa358a43149bff9671b328f8b3
i3-snapshot https://github.com/regolith-linux/i3-snapshot.git r3_1 5135c860ef4ebd02ef31e5116502ca8d69f392d3
i3-swap-focus https://github.com/regolith-linux/i3-swap-focus.git r3_1 c04ad138b8863575830315e3f58eb3f1c9cf792c
i3-wm https://github.com/regolith-linux/i3-wm.git r3_1 30cdbc5da7e904d370a715cf7ff78092e30360eb
i3xrocks https://github.com/regolith-linux/i3xrocks.git r3_1 0c39c518e5e0909268865d5b0d77c1fb9bf74d22
ilia https://github.com/regolith-linux/ilia.git r3_1-ubuntu-jammy 666a292a96f5830ff69d0f5f7cd063e6b8c5ffeb
lago https://github.com/regolith-linux/lago.git r3_1-ubuntu-jammy e73215d6f8e00f6d2fad92a2e70254a8f79fae06
nordic https://github.com/regolith-linux/nordic.git r3_1 0c7b9afcf83aa0eb9a267a52da0e8301a7e6484c
picom https://github.com/regolith-linux/picom.git r3_1 3f5e284bb3d0f5fcac105cfb5958c2c94e531042
python3-i3ipc https://github.com/regolith-linux/python3-i3ipc r3_1 4d166018e305c92220d7e4c6024bc9b0df5332ec
regolith-compositor-compton-glx https://github.com/regolith-linux/regolith-compositor-compton-glx.git r3_1 d384a6d692e097fe3a0cc0e3c9460b787092ac0f
regolith-compositor-none https://github.com/regolith-linux/regolith-compositor-none.git r3_1 23916535a412e62610c92b69099a3eb6da64d524
regolith-compositor-picom-glx https://github.com/regolith-linux/regolith-compositor-picom-glx.git r3_1 665fa4f3fc5323aaa1b04fcce50e2ad96c1235b1
regolith-compositor-xcompmgr https://github.com/regolith-linux/regolith-compositor-xcompmgr.git r3_1 1b3d09211597a78c55b6cc49754a4f7de3b8b53f
regolith-control-center https://github.com/regolith-linux/regolith-control-center.git r3_1-debian-bookworm cd5a9200de9a2736b6e13964ce2d34fcf711e6a8
regolith-default-settings https://github.com/regolith-linux/regolith-default-settings.git r3_1 0de5d8fb42f5331268b3bfe126e21b443bf2a00d
regolith-desktop https://github.com/regolith-linux/regolith-desktop.git r3_1-debian-bullseye 3bb8c6a3224bd054cd3ee86f17e41630e0622234
regolith-distro-ubuntu https://github.com/regolith-linux/regolith-distro-ubuntu.git r3_1 fe6cc85e2be19b83ec046975d9c6685f11d80bfb
regolith-ftue https://github.com/regolith-linux/regolith-ftue.git r3_1 205178b3046cbc73ec42cd81b5b24bca5ff13fa4
regolith-i3xrocks-config https://github.com/regolith-linux/regolith-i3xrocks-config.git r3_1 6b70a87a9d9fc2effc9c16efc0f1eeb19d5e8d1f
regolith-lightdm-config https://github.com/regolith-linux/regolith-lightdm-config.git r3_1 4d59d1f83d9371836eb76b88a7f3f6fb0fde7d27
regolith-look-default https://github.com/regolith-linux/regolith-look-default.git r3_1 3778cb312ae69611efdc68c4a09397892c2f556e
regolith-look-extra https://github.com/regolith-linux/regolith-look-extra.git r3_1 259d82c08fcc302c8ed1571f4fb0a0e39a294c97
regolith-rofi-config https://github.com/regolith-linux/regolith-rofi-config.git r3_1 80f26989a20e0952108c3301f7a3a7af92764208
regolith-rofication https://github.com/regolith-linux/regolith-rofication.git r3_1 ba61e7b58f02304d6ec579d9966b656a5916d698
regolith-session https://github.com/regolith-linux/regolith-session.git r3_1 859cc680413992df3085a3d7b509775920f4e7f8
regolith-system-ubuntu https://github.com/regolith-linux/regolith-system-ubuntu.git r3_1 7add3c37e39911f403e8273348d530c5afd89c6c
regolith-unclutter-xfixes https://github.com/regolith-linux/regolith-unclutter-xfixes.git r3_1 e4bbaba2f98595370ca85283f82d7b7f6c501bba
regolith-wm-config https://github.com/regolith-linux/regolith-wm-config.git r3_1 bc437b56e83a792c96345dce88ecefa60b77f316
remontoire https://github.com/regolith-linux/remontoire.git r3_1 68d562c78d6e0094ca744bd7161c308f583e93e4
solarc-theme https://github.com/regolith-linux/solarc-theme.git r3_1 761153923b0c0bc00807caaac742c47e2e2f1c08
whitesur-gtk-theme https://github.com/regolith-linux/whitesur-gtk-theme.git r3_1 ade54f53eac3af39a6ae98e984c766185419c9a7
xrescat https://github.com/regolith-linux/xrescat.git r3_1 e8e261441682244112b2020e2ad102768e6ba3fd
Loading

0 comments on commit e625cbb

Please sign in to comment.