diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 91d2437..a7f4947 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -98,7 +98,7 @@ jobs: env: VIKUNJA_TOKEN: ${{ secrets.VIKUNJA_TOKEN }} DEVX_TASK_PREFIX: GRM - DEVX_VIKUNJA_PROJECT_ID: 6 + DEVX_VIKUNJA_PROJECT_ID: 3 HEAD_REF: ${{ github.head_ref }} PR_TITLE: ${{ github.event.pull_request.title }} REPOSITORY: ${{ github.repository }} @@ -255,7 +255,7 @@ jobs: CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }} VIKUNJA_TOKEN: ${{ secrets.VIKUNJA_TOKEN }} DEVX_TASK_PREFIX: GRM - DEVX_VIKUNJA_PROJECT_ID: 6 + DEVX_VIKUNJA_PROJECT_ID: 3 HEAD_REF: ${{ github.head_ref }} PR_TITLE: ${{ github.event.pull_request.title }} REPOSITORY: ${{ github.repository }} diff --git a/.gitea/workflows/post-merge.yml b/.gitea/workflows/post-merge.yml index 7db9d88..6e5afe1 100644 --- a/.gitea/workflows/post-merge.yml +++ b/.gitea/workflows/post-merge.yml @@ -133,7 +133,7 @@ jobs: env: DEVX_VERSION_FILE: src/grm/__init__.py DEVX_TASK_PREFIX: GRM - DEVX_VIKUNJA_PROJECT_ID: 6 + DEVX_VIKUNJA_PROJECT_ID: 3 run: | . .venv/bin/activate 2>/dev/null || true export PATH="$HOME/.local/bin:$PATH" @@ -161,7 +161,7 @@ jobs: env: VIKUNJA_TOKEN: ${{ secrets.VIKUNJA_TOKEN }} DEVX_TASK_PREFIX: GRM - DEVX_VIKUNJA_PROJECT_ID: 6 + DEVX_VIKUNJA_PROJECT_ID: 3 run: | . .venv/bin/activate 2>/dev/null || true python3 -m devx.ci.post_merge --git-sha "${{ github.sha }}" diff --git a/Makefile b/Makefile index 79a8886..5aa6cea 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ setup-release: $(VENV)/bin/activate .env configure-gitea-pypi setup-image: @if [ -d /opt/venv ]; then ln -sf /opt/venv .venv; . .venv/bin/activate; \ _TOKEN="$$CI_GITEA_API_TOKEN"; [ -z "$$_TOKEN" ] && _TOKEN="$$DEVELOPER_GITEA_API_TOKEN"; [ -z "$$_TOKEN" ] && _TOKEN="$$CI_GITEA_TOKEN"; \ - if [ -n "$$_TOKEN" ]; then export PIP_EXTRA_INDEX_URL="https://$$CI_GITEA_USERNAME:$${_TOKEN}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/"; fi; \ + if [ -n "$$_TOKEN" ]; then export PIP_EXTRA_INDEX_URL="https://$$CI_GITEA_USERNAME:$${_TOKEN}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/"; git config --global url."https://$$CI_GITEA_USERNAME:$${_TOKEN}@git.oblachno.oblachno.fyi/".insteadOf "https://git.oblachno.oblachno.fyi/"; fi; \ pip install -e .$(if $(EXTRAS),[$(EXTRAS)],); \ else echo "[setup-image] /opt/venv not found — falling back to setup-ci"; $(MAKE) setup-ci; fi diff --git a/pyproject.toml b/pyproject.toml index 5b31e48..a2d2b81 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ ci = [ "build==1.5.1", "twine==6.2.0", # Reusable CI/CD and dev tools (auto-merge, pr-review, pre-push checks, etc.) - "devx @ git+https://git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.47.2", + "devx @ git+https://git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.48.0", ] # Lint and type-checking tools (validate job) lint = [ @@ -55,7 +55,7 @@ molecule = [ dev = [ "grm[ci,lint,molecule]", # Reusable CI/CD and dev tools (pre-push hooks, create-task, create-pr) - "devx @ git+https://git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.47.2", + "devx @ git+https://git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.48.0", # Non-Python dev dependency: checkmake (Makefile linter) # Install via: go install github.com/checkmake/checkmake/cmd/checkmake@latest ]