diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f47d5dc..e286ed5 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -174,7 +174,7 @@ jobs: - name: Install dependencies run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" - name: Run automated PR review env: REPO_TOKEN: ${{ secrets.REPO_TOKEN }} @@ -201,7 +201,7 @@ jobs: - name: Install dependencies run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" - name: Squash merge with task ID env: REPO_TOKEN: ${{ secrets.REPO_TOKEN }} diff --git a/.gitea/workflows/post-merge.yml b/.gitea/workflows/post-merge.yml index de48a65..6a002df 100644 --- a/.gitea/workflows/post-merge.yml +++ b/.gitea/workflows/post-merge.yml @@ -43,7 +43,7 @@ jobs: - name: Install dependencies run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" - name: Check if this is a release commit id: check env: @@ -62,7 +62,7 @@ jobs: - name: Install dependencies run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" - name: Validate latest commit message env: PYTHONPATH: src @@ -108,9 +108,7 @@ jobs: run: | export PATH="$HOME/.local/bin:$PATH" python3 -m devx.tools.install_tools --tool tea - tea login add --name grm --url "${{ github.server_url }}" --token "$REPO_TOKEN" || true - tea login default grm || true - python3 -m devx.ci.notify_failure \ + python3 -m devx.ci.notify_failure --auto-login \ --repo "${{ github.repository }}" \ --run-id "${{ github.run_id }}" \ --workflow "post-merge/release" \ @@ -144,9 +142,7 @@ jobs: run: | export PATH="$HOME/.local/bin:$PATH" python3 -m devx.tools.install_tools --tool tea - tea login add --name grm --url "${{ github.server_url }}" --token "$REPO_TOKEN" || true - tea login default grm || true - python3 -m devx.ci.notify_failure \ + python3 -m devx.ci.notify_failure --auto-login \ --repo "${{ github.repository }}" \ --run-id "${{ github.run_id }}" \ --workflow "post-merge/sync-wiki" \ @@ -185,9 +181,7 @@ jobs: run: | export PATH="$HOME/.local/bin:$PATH" python3 -m devx.tools.install_tools --tool tea - tea login add --name grm --url "${{ github.server_url }}" --token "$REPO_TOKEN" || true - tea login default grm || true - python3 -m devx.ci.notify_failure \ + python3 -m devx.ci.notify_failure --auto-login \ --repo "${{ github.repository }}" \ --run-id "${{ github.run_id }}" \ --workflow "post-merge/badges" \ @@ -205,7 +199,7 @@ jobs: - name: Install dependencies run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" - name: Update Vikunja task env: VIKUNJA_TOKEN: ${{ secrets.VIKUNJA_TOKEN }} @@ -221,9 +215,7 @@ jobs: run: | export PATH="$HOME/.local/bin:$PATH" python3 -m devx.tools.install_tools --tool tea - tea login add --name grm --url "${{ github.server_url }}" --token "$REPO_TOKEN" || true - tea login default grm || true - python3 -m devx.ci.notify_failure \ + python3 -m devx.ci.notify_failure --auto-login \ --repo "${{ github.repository }}" \ --run-id "${{ github.run_id }}" \ --workflow "post-merge/vikunja" \ @@ -239,7 +231,7 @@ jobs: - name: Install dependencies run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" - name: Ensure branch protection and labels env: REPO_TOKEN: ${{ secrets.REPO_TOKEN }} @@ -255,9 +247,7 @@ jobs: run: | export PATH="$HOME/.local/bin:$PATH" python3 -m devx.tools.install_tools --tool tea - tea login add --name grm --url "${{ github.server_url }}" --token "$REPO_TOKEN" || true - tea login default grm || true - python3 -m devx.ci.notify_failure \ + python3 -m devx.ci.notify_failure --auto-login \ --repo "${{ github.repository }}" \ --run-id "${{ github.run_id }}" \ --workflow "post-merge/configure-repo" \ diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 452b7ba..c98a40e 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: - name: Install CI tools run: | . .env 2>/dev/null || true - python3 -m pip install --break-system-packages "git+https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@v0.4.4" + python3 -m pip install --break-system-packages --target=src "devx==0.6.0" --extra-index-url "https://emil:${{ secrets.REPO_TOKEN }}@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" python3 -m devx.tools.install_tools --tool git-cliff --tool tea - name: Install build tools run: python3 -m pip install --break-system-packages build twine @@ -25,8 +25,6 @@ jobs: REPO_TOKEN: ${{ secrets.REPO_TOKEN }} run: | export PATH="$HOME/.local/bin:$PATH" - tea login add --name grm --url "${{ github.server_url }}" --token "$REPO_TOKEN" || true - tea login default grm || true - name: Build and publish release env: REPO_TOKEN: ${{ secrets.REPO_TOKEN }} @@ -44,7 +42,7 @@ jobs: PYTHONPATH: src run: | export PATH="$HOME/.local/bin:$PATH" - python3 -m devx.ci.notify_failure \ + python3 -m devx.ci.notify_failure --auto-login \ --repo "${{ github.repository }}" \ --run-id "${{ github.run_id }}" \ --workflow "publish" \ diff --git a/.taskid b/.taskid index a2aba96..c750564 100644 --- a/.taskid +++ b/.taskid @@ -1 +1 @@ -GRM-70 +GRM-72 diff --git a/Makefile b/Makefile index 2fe4dfb..c4a9605 100644 --- a/Makefile +++ b/Makefile @@ -9,13 +9,14 @@ all: setup # Pinned devx version — update this when upgrading devx. # All workflow files (.gitea/workflows/*.yml) must be updated to match. -DEVX_VERSION := v0.4.4 +DEVX_VERSION := v0.6.0 install-devx: $(VENV)/bin/activate @# REPO_TOKEN may come from .env (local) or environment (CI secrets) - @if [ -z "$$REPO_TOKEN" ]; then . .env 2>/dev/null; fi; \ + @if [ -z "$$REPO_TOKEN" ]; then . ./.env 2>/dev/null; fi; \ if [ -z "$$REPO_TOKEN" ]; then echo "REPO_TOKEN not set (check .env or environment)"; exit 1; fi; \ - $(BIN)/pip install "git+https://emil:$$REPO_TOKEN@git.oblachno.oblachno.fyi/oblachno-oss/devx.git@$(DEVX_VERSION)" + $(BIN)/pip install "devx==$(shell echo $(DEVX_VERSION) | sed 's/^v//')" \ + --extra-index-url "https://emil:$$REPO_TOKEN@git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple/" # Full setup for local development (all deps, tools, collections, hooks) # install-devx must run before install-tools (which uses devx modules) @@ -126,7 +127,7 @@ lint-deps: .venv/bin/pip-audit --desc --skip-editable 2>&1 || true ansible-lint: - $(BIN)/ansible-lint ansible/ + PATH="$(PWD)/$(BIN):$$PATH" $(BIN)/ansible-lint ansible/ makefile-lint: @$(CHECKMAKE) Makefile