From ebe21fe1b84b2b34296081f7697c2431f6f74aaa Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:01:43 +1100 Subject: [PATCH 01/39] Added build action --- .gitea/workflows/release.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .gitea/workflows/release.yml diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml new file mode 100644 index 0000000..6d09021 --- /dev/null +++ b/.gitea/workflows/release.yml @@ -0,0 +1,23 @@ +# .gitea/workflows/release.yml + +on: + release: + types: [created] + +jobs: + release: + name: release ${{ matrix.target }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + target: [x86_64-unknown-linux-gnu] + steps: + - uses: actions/checkout@master + - name: Compile and release + uses: rust-build/rust-build.action@v1.4.5 + env: + GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} + with: + RUSTTARGET: ${{ matrix.target }} + EXTRA_FILES: "README.md" \ No newline at end of file From 9ef385716c1726fee5d86300ab2feecedefd6fb1 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:05:14 +1100 Subject: [PATCH 02/39] Fixed action --- .gitea/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 6d09021..3ba9c43 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -1,8 +1,9 @@ # .gitea/workflows/release.yml on: - release: - types: [created] + push: + tags: + - 'master' jobs: release: From c0592bd98fd4bfee41c7e08f3e18517d601b7587 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:07:25 +1100 Subject: [PATCH 03/39] really fixed action --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 3ba9c43..4586329 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -3,7 +3,7 @@ on: push: tags: - - 'master' + - '*' jobs: release: From 3926ccb3e7fd1e90c25780e7c55cb769da6e0818 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:10:19 +1100 Subject: [PATCH 04/39] Only MUSL no GNU --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 4586329..4637736 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - target: [x86_64-unknown-linux-gnu] + target: [x86_64-unknown-linux-musl] steps: - uses: actions/checkout@master - name: Compile and release From 1399ebb9c4f616e349f36c5c13c01d0df2353c56 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:16:50 +1100 Subject: [PATCH 05/39] Moved `untildify` to a git repo --- Cargo.lock | 1 + Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index e95beb4..81fb36f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -157,6 +157,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "untildify" version = "0.1.1" +source = "git+https://git.lovelynet.net/benjamyn/untildify.git?branch=main#91e595157c9720d4fb5c50595e7f601473066de2" dependencies = [ "regex", ] diff --git a/Cargo.toml b/Cargo.toml index 6b011ff..0e255dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,4 +8,4 @@ configparser = "3.0.4" dbus = "0.9.7" glob = "0.3.1" rand = "0.8.5" -untildify = { path = "../untildify" } +untildify = { git = "https://git.lovelynet.net/benjamyn/untildify.git", branch = "main" } From 31be922916ea31f7c2fabf2060082cfcc43addeb Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:22:08 +1100 Subject: [PATCH 06/39] fucking dbus --- .gitea/workflows/release.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 4637736..7e00abd 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,13 +7,16 @@ on: jobs: release: - name: release ${{ matrix.target }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: [x86_64-unknown-linux-musl] - steps: + - name: Install Dependencies + - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + + - name: release ${{ matrix.target }} + - runs-on: ubuntu-latest + - strategy: + fail-fast: false + matrix: + - target: [x86_64-unknown-linux-musl] + - steps: - uses: actions/checkout@master - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 From 42e4b039393284d719212a4bcb97391521f249e0 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:24:04 +1100 Subject: [PATCH 07/39] Please work --- .gitea/workflows/release.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 7e00abd..7e13b9e 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,21 +7,22 @@ on: jobs: release: - - name: Install Dependencies - - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - - - name: release ${{ matrix.target }} - - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - - target: [x86_64-unknown-linux-musl] - steps: - - uses: actions/checkout@master - - name: Compile and release - uses: rust-build/rust-build.action@v1.4.5 - env: - GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} - with: - RUSTTARGET: ${{ matrix.target }} - EXTRA_FILES: "README.md" \ No newline at end of file + - name: Install Dependencies + - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + + - name: release ${{ matrix.target }} + - runs-on: ubuntu-latest + - strategy: + fail-fast: false + matrix: + - target: [x86_64-unknown-linux-musl] + - steps: + - uses: actions/checkout@master + - name: Compile and release + uses: rust-build/rust-build.action@v1.4.5 + env: + GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} + with: + RUSTTARGET: ${{ matrix.target }} + EXTRA_FILES: "README.md" \ No newline at end of file From e9166e142358d63f776dd8a7b40b8b70f07ce63b Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:24:26 +1100 Subject: [PATCH 08/39] Fixed yaml? --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 7e13b9e..a28b9b0 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: - steps: - - name: Install Dependencies + - name: Install Dependencies - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - name: release ${{ matrix.target }} From 704785b8101eece7ecef83abd5f375d65a2c4328 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:25:30 +1100 Subject: [PATCH 09/39] actions --- .gitea/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index a28b9b0..91d2976 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,10 +7,6 @@ on: jobs: release: - - steps: - - name: Install Dependencies - - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - - name: release ${{ matrix.target }} - runs-on: ubuntu-latest - strategy: @@ -18,6 +14,10 @@ jobs: matrix: - target: [x86_64-unknown-linux-musl] - steps: + - name: Install Dependencies + - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + + - uses: actions/checkout@master - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 From 47b2e3782a92b182ca1863303f6e189da0da711e Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:26:11 +1100 Subject: [PATCH 10/39] formatting --- .gitea/workflows/release.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 91d2976..9c1aeed 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,22 +7,22 @@ on: jobs: release: - - name: release ${{ matrix.target }} - - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - - target: [x86_64-unknown-linux-musl] - - steps: - - name: Install Dependencies - - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + name: release ${{ matrix.target }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + - target: [x86_64-unknown-linux-musl] + steps: + name: Install Dependencies + run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - - uses: actions/checkout@master - - name: Compile and release - uses: rust-build/rust-build.action@v1.4.5 - env: - GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} - with: - RUSTTARGET: ${{ matrix.target }} - EXTRA_FILES: "README.md" \ No newline at end of file + uses: actions/checkout@master + name: Compile and release + uses: rust-build/rust-build.action@v1.4.5 + env: + GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} + with: + RUSTTARGET: ${{ matrix.target }} + EXTRA_FILES: "README.md" \ No newline at end of file From 0d8ffd5d1547f69774cbd4983b4eea8adc82d07f Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:27:03 +1100 Subject: [PATCH 11/39] Maybe? --- .gitea/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 9c1aeed..5618663 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -14,12 +14,11 @@ jobs: matrix: - target: [x86_64-unknown-linux-musl] steps: - name: Install Dependencies + - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - + - name: Compile and release uses: actions/checkout@master - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} From cd10baa33571c3d0eb5dd07ec255d5332681545f Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:27:27 +1100 Subject: [PATCH 12/39] x --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 5618663..147daa5 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - - target: [x86_64-unknown-linux-musl] + target: [x86_64-unknown-linux-musl] steps: - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus From cf0d7f85eb2c02534299909a636ed1e3ea3281ff Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:27:50 +1100 Subject: [PATCH 13/39] I swear to fucking god --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 147daa5..4c021cc 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: target: [x86_64-unknown-linux-musl] - steps: + - steps: - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus From 9751eec5bcfbd1263cc0515508113aa3898b9177 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:28:11 +1100 Subject: [PATCH 14/39] x --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 4c021cc..8907d5f 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -6,7 +6,7 @@ on: - '*' jobs: - release: + - release: name: release ${{ matrix.target }} runs-on: ubuntu-latest strategy: From 2bb9933431772367266debbd16f643a10d3e992e Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:28:38 +1100 Subject: [PATCH 15/39] ARRRRRRRRRGH --- .gitea/workflows/release.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 8907d5f..86f8d82 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -6,22 +6,22 @@ on: - '*' jobs: - - release: - name: release ${{ matrix.target }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: [x86_64-unknown-linux-musl] - - steps: - - name: Install Dependencies - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + release: + name: release ${{ matrix.target }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + target: [x86_64-unknown-linux-musl] + - steps: + - name: Install Dependencies + run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - - name: Compile and release - uses: actions/checkout@master - uses: rust-build/rust-build.action@v1.4.5 - env: - GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} - with: - RUSTTARGET: ${{ matrix.target }} - EXTRA_FILES: "README.md" \ No newline at end of file + - name: Compile and release + uses: actions/checkout@master + uses: rust-build/rust-build.action@v1.4.5 + env: + GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} + with: + RUSTTARGET: ${{ matrix.target }} + EXTRA_FILES: "README.md" \ No newline at end of file From d48bbc471c8f6bc93726d3110ece90648a21c071 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:30:10 +1100 Subject: [PATCH 16/39] zxcxz --- .gitea/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 86f8d82..0e4956a 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -13,11 +13,11 @@ jobs: fail-fast: false matrix: target: [x86_64-unknown-linux-musl] - - steps: - - name: Install Dependencies + steps: + name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - - name: Compile and release + name: Compile and release uses: actions/checkout@master uses: rust-build/rust-build.action@v1.4.5 env: From e0337e01148a780bd4a79b7469496a279a434087 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:31:48 +1100 Subject: [PATCH 17/39] asd --- .gitea/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 0e4956a..1159907 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -14,12 +14,13 @@ jobs: matrix: target: [x86_64-unknown-linux-musl] steps: + uses: rust-build/rust-build.action@v1.4.5 name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus name: Compile and release uses: actions/checkout@master - uses: rust-build/rust-build.action@v1.4.5 + env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} with: From 7506503def18d0bac10ed3ae5bd277a6040ef03d Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:32:11 +1100 Subject: [PATCH 18/39] asdad --- .gitea/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 1159907..1e44ddb 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -15,10 +15,10 @@ jobs: target: [x86_64-unknown-linux-musl] steps: uses: rust-build/rust-build.action@v1.4.5 - name: Install Dependencies + - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - name: Compile and release + - name: Compile and release uses: actions/checkout@master env: From 7b2e1de2014972dea9b878cfe2edbb359c04fc1a Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:33:33 +1100 Subject: [PATCH 19/39] gdfh --- .gitea/workflows/release.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 1e44ddb..49754e7 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,22 +7,18 @@ on: jobs: release: - name: release ${{ matrix.target }} runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: [x86_64-unknown-linux-musl] + name: release ${{ matrix.target }} + steps: - uses: rust-build/rust-build.action@v1.4.5 - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - name: Compile and release uses: actions/checkout@master - + uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} with: - RUSTTARGET: ${{ matrix.target }} + RUSTTARGET: x86_64-unknown-linux-musl EXTRA_FILES: "README.md" \ No newline at end of file From 6aedd1cabf8e49911ec197e0f3022e237022c1aa Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:33:59 +1100 Subject: [PATCH 20/39] gfdgh --- .gitea/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 49754e7..c436d89 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -9,7 +9,6 @@ jobs: release: runs-on: ubuntu-latest name: release ${{ matrix.target }} - steps: - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus From 125188755e31147a4923c057fbb6b58516622998 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:34:20 +1100 Subject: [PATCH 21/39] pls work --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index c436d89..745e6af 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: runs-on: ubuntu-latest - name: release ${{ matrix.target }} + # name: release ${{ matrix.target }} steps: - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus From 5b628744c2f0cb450fc14aaddb9afbdaf24e5078 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:35:51 +1100 Subject: [PATCH 22/39] dfghfd --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 745e6af..118675d 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -13,8 +13,8 @@ jobs: - name: Install Dependencies run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + - uses: actions/checkout@master - name: Compile and release - uses: actions/checkout@master uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} From db9e936d1ee125105f0b7e15426cd0f10a558ffc Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:38:57 +1100 Subject: [PATCH 23/39] work? --- .gitea/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 118675d..3995b93 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -10,11 +10,9 @@ jobs: runs-on: ubuntu-latest # name: release ${{ matrix.target }} steps: - - name: Install Dependencies + uses: actions/checkout@master + name: Compile and release run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - - - uses: actions/checkout@master - - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} From ef884214b9cf94bf14513494bba54c7a1f857f19 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:40:04 +1100 Subject: [PATCH 24/39] fsdf --- .gitea/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 3995b93..3037538 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest # name: release ${{ matrix.target }} steps: - uses: actions/checkout@master - name: Compile and release - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus - uses: rust-build/rust-build.action@v1.4.5 + - uses: actions/checkout@master + - name: Compile and release + run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} with: From f9151fd192185a9b0149b5380e71a73c14590911 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:40:41 +1100 Subject: [PATCH 25/39] revert to old --- .gitea/workflows/release.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 3037538..4637736 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -7,15 +7,18 @@ on: jobs: release: + name: release ${{ matrix.target }} runs-on: ubuntu-latest - # name: release ${{ matrix.target }} + strategy: + fail-fast: false + matrix: + target: [x86_64-unknown-linux-musl] steps: - uses: actions/checkout@master - name: Compile and release - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus uses: rust-build/rust-build.action@v1.4.5 - env: - GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} - with: - RUSTTARGET: x86_64-unknown-linux-musl - EXTRA_FILES: "README.md" \ No newline at end of file + env: + GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} + with: + RUSTTARGET: ${{ matrix.target }} + EXTRA_FILES: "README.md" \ No newline at end of file From f8db89198ffb8f7f9cd7cd75a6c7d9debb429e86 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:41:04 +1100 Subject: [PATCH 26/39] dsfds --- .gitea/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 4637736..c431b5f 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -16,6 +16,7 @@ jobs: steps: - uses: actions/checkout@master - name: Compile and release + run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} From 3a233b610f0e39cb019814400ded64725666febe Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:42:15 +1100 Subject: [PATCH 27/39] fdgfd --- .gitea/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index c431b5f..e0886e4 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -15,8 +15,9 @@ jobs: target: [x86_64-unknown-linux-musl] steps: - uses: actions/checkout@master - - name: Compile and release + - name: Install deps run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} From 55f831b38c0aaf0c6761e824abcc1ad62fb8de44 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:42:56 +1100 Subject: [PATCH 28/39] asdasd --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index e0886e4..d9531cb 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@master - name: Install deps - run: sudo apt-get install libdbus-1-dev libdbus-glib-1-dbus + run: apt-get install libdbus-1-dev libdbus-glib-1-dbus - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: From bfc113b0fb89d8ca7688f78ca992bfc1a3bbc324 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:45:26 +1100 Subject: [PATCH 29/39] Fixed apt --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index d9531cb..e023804 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@master - name: Install deps - run: apt-get install libdbus-1-dev libdbus-glib-1-dbus + run: apt-get update; apt-get install libdbus-1-dev - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: From cf6d3e59f1d5342f904208e64cf9f62cc9107934 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:46:46 +1100 Subject: [PATCH 30/39] Fixed apt prompting --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index e023804..1eefabe 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@master - name: Install deps - run: apt-get update; apt-get install libdbus-1-dev + run: apt-get update; apt-get install -y libdbus-1-dev - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: From 9b140661484d60d56c557df74ce92b456213b96e Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:47:47 +1100 Subject: [PATCH 31/39] dfsf --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 1eefabe..4a1b3b1 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@master - name: Install deps - run: apt-get update; apt-get install -y libdbus-1-dev + run: apt-get update; apt-get install -y libdbus-1-dev pkg-config - name: Compile and release uses: rust-build/rust-build.action@v1.4.5 env: From 7003bb888991afa2bf506a70e353be09252e9c48 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:48:47 +1100 Subject: [PATCH 32/39] dsfsd --- .gitea/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 4a1b3b1..96bd096 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -23,4 +23,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} with: RUSTTARGET: ${{ matrix.target }} - EXTRA_FILES: "README.md" \ No newline at end of file + EXTRA_FILES: "README.md" + PKG_CONFIG_PATH: + - /usr/lib/pkgconfig \ No newline at end of file From 67c2d1d31b8e8bf84987ac518dc5e6c4b52e247c Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:49:30 +1100 Subject: [PATCH 33/39] This needs to be a string? --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 96bd096..b1fd878 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -25,4 +25,4 @@ jobs: RUSTTARGET: ${{ matrix.target }} EXTRA_FILES: "README.md" PKG_CONFIG_PATH: - - /usr/lib/pkgconfig \ No newline at end of file + - "/usr/lib/pkgconfig" \ No newline at end of file From 6427ecd098a5f0e4a8f6096783917852ba5aa7d3 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:49:50 +1100 Subject: [PATCH 34/39] asdasd --- .gitea/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index b1fd878..8c56e46 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -24,5 +24,4 @@ jobs: with: RUSTTARGET: ${{ matrix.target }} EXTRA_FILES: "README.md" - PKG_CONFIG_PATH: - - "/usr/lib/pkgconfig" \ No newline at end of file + PKG_CONFIG_PATH: ["/usr/lib/pkgconfig"] \ No newline at end of file From 75dce310be7efe7fcfeaf921bc0fa30634d7ef1d Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:50:13 +1100 Subject: [PATCH 35/39] asdasf --- .gitea/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 8c56e46..2f29630 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -23,5 +23,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} with: RUSTTARGET: ${{ matrix.target }} - EXTRA_FILES: "README.md" - PKG_CONFIG_PATH: ["/usr/lib/pkgconfig"] \ No newline at end of file + EXTRA_FILES: README.md + PKG_CONFIG_PATH: [/usr/lib/pkgconfig] \ No newline at end of file From 4c5c9fe8ed80928c2711fb66dc2bf0bec8101bf2 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:51:50 +1100 Subject: [PATCH 36/39] asdasd --- .gitea/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 2f29630..71115e0 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -23,5 +23,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GT_TOKEN }} with: RUSTTARGET: ${{ matrix.target }} - EXTRA_FILES: README.md - PKG_CONFIG_PATH: [/usr/lib/pkgconfig] \ No newline at end of file + EXTRA_FILES: README.md \ No newline at end of file From e622041d01c9b67ce449b8b0616518c7a4212eb4 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 19:57:24 +1100 Subject: [PATCH 37/39] Upgrade base image? --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 71115e0..55ee35a 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: name: release ${{ matrix.target }} - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: From 8e5c810a117cb0e33d3ff980f42f43739c1a52ec Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 5 Dec 2024 20:20:26 +1100 Subject: [PATCH 38/39] try alma ( i know apt will fail ) --- .gitea/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 55ee35a..b991f20 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: name: release ${{ matrix.target }} - runs-on: ubuntu-24.04 + runs-on: alma9 strategy: fail-fast: false matrix: From ce12890f173bae71b8ac5f680919306181632a6b Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Thu, 2 Jan 2025 16:11:48 +1100 Subject: [PATCH 39/39] Removed debug print prepended _ to count variable --- src/handlers/plasma.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/handlers/plasma.rs b/src/handlers/plasma.rs index 3edc322..a8dc2ab 100644 --- a/src/handlers/plasma.rs +++ b/src/handlers/plasma.rs @@ -30,7 +30,7 @@ pub fn change_wallpapers(wallpapers: &Wallpapers) { pub fn generate_js(wallpapers: &Wallpapers) -> String { let mut javascript = String::new(); javascript.push_str("var allDesktops = desktops();\n"); - for (count, monitor) in wallpapers.config.monitors.monitors.iter().enumerate() { + for (_count, monitor) in wallpapers.config.monitors.monitors.iter().enumerate() { let mut boilerplate = String::new(); let _ = write!( &mut boilerplate, @@ -44,6 +44,5 @@ pub fn generate_js(wallpapers: &Wallpapers) -> String { ); javascript.push_str(&boilerplate); } - println!("{}", javascript); javascript }