From 5b9ad2cf92349a01d7ed791a9a548126df0acc70 Mon Sep 17 00:00:00 2001 From: Steffen Ridderbusch Date: Mon, 20 Jan 2025 19:24:56 +0000 Subject: [PATCH 1/5] Just try building --- recipes/recipe.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index c97a675..2364d04 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -9,6 +9,17 @@ description: OS image for desktop. base-image: ghcr.io/ublue-os/sericea-main image-version: 41 # latest is also supported if you want new updates ASAP +stages: + - name: regreet + from: docker.io/library/rust + modules: + - type: script + snippets: + - apt-get update && apt-get install -y git # Install git + - git clone https://github.com/rharish101/ReGreet.git + - cd ReGeet && cargo build --release + # - mkdir -p /out/ && mv $CARGO_HOME/bin/hx /out/hx && mv runtime /out/ # Move bin and runtime + # module configuration, executed in order # you can include multiple instances of the same module modules: From 7fac09939a4feb7781900734bd480a681a044e2a Mon Sep 17 00:00:00 2001 From: Steffen Ridderbusch Date: Mon, 20 Jan 2025 19:32:31 +0000 Subject: [PATCH 2/5] Don't run on push, and fix typo --- .github/workflows/build.yml | 6 +++--- recipes/recipe.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09ba95c..4bef8cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,9 @@ on: - cron: "00 06 * * *" # build at 06:00 UTC every day # (20 minutes after last ublue images start building) - push: - paths-ignore: # don't rebuild if only documentation has changed - - "**.md" + # push: + # paths-ignore: # don't rebuild if only documentation has changed + # - "**.md" pull_request: workflow_dispatch: # allow manually triggering builds diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 2364d04..0d08aa9 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -17,7 +17,7 @@ stages: snippets: - apt-get update && apt-get install -y git # Install git - git clone https://github.com/rharish101/ReGreet.git - - cd ReGeet && cargo build --release + - cd ReGreet && cargo build --release # - mkdir -p /out/ && mv $CARGO_HOME/bin/hx /out/hx && mv runtime /out/ # Move bin and runtime # module configuration, executed in order From d2118a034e2198cf2764d9b05519f0a2533f0375 Mon Sep 17 00:00:00 2001 From: Steffen Ridderbusch Date: Mon, 20 Jan 2025 20:06:08 +0000 Subject: [PATCH 3/5] Copy over --- recipes/recipe.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 0d08aa9..7a8330c 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -17,8 +17,9 @@ stages: snippets: - apt-get update && apt-get install -y git # Install git - git clone https://github.com/rharish101/ReGreet.git - - cd ReGreet && cargo build --release - # - mkdir -p /out/ && mv $CARGO_HOME/bin/hx /out/hx && mv runtime /out/ # Move bin and runtime + - cd ReGreet + - cargo build --release + - mkdir -p /out/ && mv target/release /out/regreet # module configuration, executed in order # you can include multiple instances of the same module @@ -51,6 +52,10 @@ modules: remove: - org.gnome.eog user: {} # Also add Flathub user repo, but no user packages + - type: copy + from: regreet + src: /out/regreet + dest: /usr/bin/ - type: files files: - source: system/etc/greetd From 76b2ee3a63ed8a219507244841d9daae94f2f220 Mon Sep 17 00:00:00 2001 From: Steffen Ridderbusch Date: Mon, 20 Jan 2025 20:10:31 +0000 Subject: [PATCH 4/5] Different snippet --- recipes/recipe.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 7a8330c..ca89d1a 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -17,9 +17,8 @@ stages: snippets: - apt-get update && apt-get install -y git # Install git - git clone https://github.com/rharish101/ReGreet.git - - cd ReGreet - - cargo build --release - - mkdir -p /out/ && mv target/release /out/regreet + - cd ReGreet && cargo build --release + - mkdir -p /out/ && mv ReGreet/target/release /out/regreet # module configuration, executed in order # you can include multiple instances of the same module From beee8c32d4c54c3a60be245e708c5bc14dbbbe01 Mon Sep 17 00:00:00 2001 From: Steffen Ridderbusch Date: Mon, 20 Jan 2025 20:18:27 +0000 Subject: [PATCH 5/5] Add gtk (maybe) --- recipes/recipe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipe.yml b/recipes/recipe.yml index ca89d1a..d469645 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -15,7 +15,7 @@ stages: modules: - type: script snippets: - - apt-get update && apt-get install -y git # Install git + - apt-get update && apt-get install -y git libgtk-4-dev # Install git - git clone https://github.com/rharish101/ReGreet.git - cd ReGreet && cargo build --release - mkdir -p /out/ && mv ReGreet/target/release /out/regreet