From a89d5cc6d93dfbb41d1ac4341b74f4b2c7de0ac9 Mon Sep 17 00:00:00 2001 From: redbinder0526 Date: Tue, 28 Apr 2026 13:11:31 +0200 Subject: [PATCH 1/4] fix(ci): use $RNEX_CONTAINER_PLATFORM runner variable --- .forgejo/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 6ab481e..71cbce2 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -30,7 +30,7 @@ jobs: key: image-cache - name: Login to registry - run: podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net + run: $RNEX_CONTAINER_PLATFORM login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net - name: Set short SHA run: echo "SHORT_SHA=${GITHUB_SHA::6}" >> $GITHUB_ENV @@ -40,9 +40,9 @@ jobs: CI_REGISTRY_IMAGE: git.spbr.net/spacebar/account CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }} run: | - podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net - podman build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" . - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" + $RNEX_CONTAINER_PLATFORM login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net + $RNEX_CONTAINER_PLATFORM build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" . + $RNEX_CONTAINER_PLATFORM push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - name: Push retagged branch env: @@ -50,10 +50,10 @@ jobs: CI_COMMIT_SHORT_SHA: ${{ forgejo.ref_name }} CI_COMMIT_PREVIOUS_SHA: ${{ env.SHORT_SHA }} run: | - podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" - podman tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" + $RNEX_CONTAINER_PLATFORM login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net + $RNEX_CONTAINER_PLATFORM pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" + $RNEX_CONTAINER_PLATFORM tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" + $RNEX_CONTAINER_PLATFORM push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - name: Push retagged latest env: @@ -61,7 +61,7 @@ jobs: CI_COMMIT_SHORT_SHA: latest CI_COMMIT_PREVIOUS_SHA: ${{ env.SHORT_SHA }} run: | - podman login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" - podman tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" \ No newline at end of file + $RNEX_CONTAINER_PLATFORM login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net + $RNEX_CONTAINER_PLATFORM pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" + $RNEX_CONTAINER_PLATFORM tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_PREVIOUS_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" + $RNEX_CONTAINER_PLATFORM push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" \ No newline at end of file From 6053db5241f5df1352a627cf3c25114d46594cae Mon Sep 17 00:00:00 2001 From: Spacebot Date: Tue, 28 Apr 2026 12:01:05 +0000 Subject: [PATCH 2/4] Update Rust crate log to v0.4.29 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2857b6..156ee4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2098,9 +2098,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "loom" From 6fa87575388d44a54094a90a778a0c3b8ae6949d Mon Sep 17 00:00:00 2001 From: redbinder0526 Date: Tue, 28 Apr 2026 15:06:41 +0200 Subject: [PATCH 3/4] Update renovate.json --- renovate.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 7190a60..3f918de 100644 --- a/renovate.json +++ b/renovate.json @@ -1,3 +1,14 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json" -} + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:recommended"], + "packageRules": [ + { + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }, + { + "matchUpdateTypes": ["major"], + "automerge": false + } + ] +} \ No newline at end of file From 4cf4714a77d6bf6411183d71f24eaa38146772f2 Mon Sep 17 00:00:00 2001 From: Spacebot Date: Tue, 28 Apr 2026 14:17:01 +0000 Subject: [PATCH 4/4] Update Rust crate lettre to v0.11.21 --- Cargo.lock | 61 +++--------------------------------------------------- 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 156ee4b..0ad0964 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,18 +229,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -631,16 +619,6 @@ dependencies = [ "windows-link 0.1.1", ] -[[package]] -name = "chumsky" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" -dependencies = [ - "hashbrown 0.14.5", - "stacker", -] - [[package]] name = "cipher" version = "0.4.4" @@ -1345,16 +1323,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - [[package]] name = "hashbrown" version = "0.15.2" @@ -2006,12 +1974,11 @@ dependencies = [ [[package]] name = "lettre" -version = "0.11.16" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2" +checksum = "dabda5859ee7c06b995b9d1165aa52c39110e079ef609db97178d86aeb051fa7" dependencies = [ "base64", - "chumsky", "email-encoding", "email_address", "fastrand", @@ -2024,7 +1991,7 @@ dependencies = [ "nom", "percent-encoding", "quoted_printable", - "socket2 0.5.8", + "socket2 0.6.3", "tokio", "url", ] @@ -2667,15 +2634,6 @@ dependencies = [ "prost", ] -[[package]] -name = "psm" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" -dependencies = [ - "cc", -] - [[package]] name = "quick-xml" version = "0.37.5" @@ -3705,19 +3663,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "stacker" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "windows-sys 0.59.0", -] - [[package]] name = "state" version = "0.6.0"