diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 71cbce2..6ab481e 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -30,7 +30,7 @@ jobs: key: image-cache - name: Login to registry - run: $RNEX_CONTAINER_PLATFORM login -u ${{ secrets.PACKAGE_USER }} -p ${{ secrets.PACKAGE_PWD }} git.spbr.net + 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 @@ -40,9 +40,9 @@ jobs: CI_REGISTRY_IMAGE: git.spbr.net/spacebar/account CI_COMMIT_SHORT_SHA: ${{ env.SHORT_SHA }} run: | - $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" + 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: @@ -50,10 +50,10 @@ jobs: CI_COMMIT_SHORT_SHA: ${{ forgejo.ref_name }} CI_COMMIT_PREVIOUS_SHA: ${{ env.SHORT_SHA }} run: | - $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" + 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: @@ -61,7 +61,7 @@ jobs: CI_COMMIT_SHORT_SHA: latest CI_COMMIT_PREVIOUS_SHA: ${{ env.SHORT_SHA }} run: | - $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 + 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 diff --git a/Cargo.lock b/Cargo.lock index 0ad0964..67ec415 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2065,9 +2065,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "loom" diff --git a/renovate.json b/renovate.json index 3f918de..7190a60 100644 --- a/renovate.json +++ b/renovate.json @@ -1,14 +1,3 @@ { - "$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 + "$schema": "https://docs.renovatebot.com/renovate-schema.json" +}