From 47d59973df6cd2b08e604e6e010cc9602fbb5f80 Mon Sep 17 00:00:00 2001 From: Spacebot Date: Tue, 28 Apr 2026 14:19:26 +0000 Subject: [PATCH 1/4] Update Rust crate md-5 to 0.11 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2c0be67..97bb320 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ hex-literal = "0.4" aes = "0.8" ctr = "0.9" hmac = "0.12" -md-5 = "0.10" +md-5 = "0.11" rand = "0.8" anyhow = "1.0" base64 = "0.21" From 101ed605c9f5c8662e02651217a71ab920ea3884 Mon Sep 17 00:00:00 2001 From: BloxerHD018 Date: Sat, 2 May 2026 20:32:20 +0100 Subject: [PATCH 2/4] Switch to Forgejo Actions --- .forgejo/workflows/build.yml | 67 ++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 43 ----------------------- 2 files changed, 67 insertions(+), 43 deletions(-) create mode 100644 .forgejo/workflows/build.yml delete mode 100644 .gitlab-ci.yml diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..fcadfd9 --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,67 @@ +name: Build and Test + +on: + push: + branches: ["**"] + pull_request: + +env: + DOCKER_TLS_CERTDIR: /certs + IMAGE_TAG: ${{ github.sha }} + SHORT_SHA: ${{ github.sha }} + +jobs: + cache-mii: + runs-on: debian-trixie + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Cache Container Storage + uses: actions/cache@v4 + with: + path: | + /var/lib/containers/storage + /run/containers/storage + ~/.local/share/containers/storage + key: image-cache + + - name: Login to Registry + run: podman 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 + + - name: Build and Push + env: + CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-boss + 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" + + - name: Push Retagged Branch + env: + CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-boss + 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" + + - name: Push Retagged Latest + env: + CI_REGISTRY_IMAGE: git.spbr.net/spacebar/rust-boss + 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" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index e1f1315..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,43 +0,0 @@ -default: - image: quay.io/podman/stable - -stages: - - test - - build - - retag - -test: - stage: test - image: rust:alpine3.22 - script: - - apk add --no-cache musl-dev openssl-dev openssl-libs-static protobuf-dev lld - - cargo test - -build-and-push-image: - stage: build - script: - - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - podman build -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" . - - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - -push-retagged-branch: - stage: retag - script: - - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - - podman tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - rules: - - if: $CI_PIPELINE_SOURCE == "push" - when: on_success - -push-retagged-latest: - stage: retag - script: - - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - - podman tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:latest" - - podman push "$CI_REGISTRY_IMAGE:latest" - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push" - when: on_success From 0bd1a40303b6fcf414d8b001b563d93ef1e0e12b Mon Sep 17 00:00:00 2001 From: BloxerHD018 Date: Sat, 2 May 2026 20:39:05 +0100 Subject: [PATCH 3/4] Migrate keycloak-helper to Spacebar Forgejo --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2c0be67..59ff86d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,4 +28,4 @@ aws-config = { version = "1.1", features = ["behavior-version-latest"] } aws-sdk-s3 = "1.17" tokio = { version = "1.50.0", features = ["full"] } log = "0.4.29" -keycloak-helper = { git = "https://git.virintox.com/BloxerHD018/keycloak-helper.git" } +keycloak-helper = { git = "https://git.spbr.net/bloxerhd018/keycloak-helper.git" } From 2a9e6ec6ce28114c3e96c98c2f16325bd838bbc8 Mon Sep 17 00:00:00 2001 From: Spacebot Date: Sat, 2 May 2026 19:46:39 +0000 Subject: [PATCH 4/4] Update Rust crate md-5 to 0.11 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 59ff86d..a857615 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ hex-literal = "0.4" aes = "0.8" ctr = "0.9" hmac = "0.12" -md-5 = "0.10" +md-5 = "0.11" rand = "0.8" anyhow = "1.0" base64 = "0.21"