diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index fcadfd9..8300e76 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -11,7 +11,7 @@ env: SHORT_SHA: ${{ github.sha }} jobs: - cache-mii: + rust-boss: runs-on: debian-trixie steps: @@ -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/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" + $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" + $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" diff --git a/Cargo.toml b/Cargo.toml index b1b3b78..59ff86d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ aes = "0.8" ctr = "0.9" hmac = "0.12" md-5 = "0.10" -rand = "0.10" +rand = "0.8" anyhow = "1.0" base64 = "0.21" reqwest = { version = "0.11", features = ["json", "rustls-tls"] }