ci: resolve merge conflicts and keep optimized workflows

Author: colyerdeng

.github/workflows/bump_version.yaml

@@ -31,6 +31,10 @@ jobs:
     runs-on: ubuntu-latest
     name: "Bump version and create changelog with commitizen"
     steps:
+      - name: Debug token (bump-version job)
+        run: |
+          echo "Token from setup job is set: ${{ needs.setup.outputs.PERSONAL_ACCESS_TOKEN != '' }}"
+
       - name: Check out
         uses: actions/checkout@v4
         with:

.github/workflows/setup.yaml

@@ -17,12 +17,16 @@ on:
       python-version:
         description: "The Python version that was set up"
         value: ${{ jobs.setup.outputs.python-version }}
+      PERSONAL_ACCESS_TOKEN:
+        description: "The personal access token"
+        value: ${{ jobs.setup.outputs.PERSONAL_ACCESS_TOKEN }}
 
 jobs:
   setup:
     runs-on: ubuntu-latest
     outputs:
       python-version: ${{ steps.setup-python.outputs.python-version }}
+      PERSONAL_ACCESS_TOKEN: ${{ steps.set-token.outputs.PERSONAL_ACCESS_TOKEN }}
     steps:
       - name: Load secret
         uses: 1password/load-secrets-action@v2
@@ -32,6 +36,20 @@ jobs:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
           PERSONAL_ACCESS_TOKEN: op://shawndengdev/github_access_token/credential
 
+      - name: Set token output
+        id: set-token
+        run: |
+          if [ -z "${PERSONAL_ACCESS_TOKEN}" ]; then
+            echo "Error: PERSONAL_ACCESS_TOKEN is not set"
+            exit 1
+          fi
+          echo "PERSONAL_ACCESS_TOKEN=${PERSONAL_ACCESS_TOKEN}" >> $GITHUB_OUTPUT
+
+      - name: Debug token (setup job)
+        run: |
+          echo "Token is set: ${{ steps.set-token.outputs.PERSONAL_ACCESS_TOKEN != '' }}"
+          echo "Token first char: ${PERSONAL_ACCESS_TOKEN:0:1}"
+
       - name: Check out
         uses: actions/checkout@v4
         with:

CHANGELOG.md

@@ -1,3 +1,31 @@
+## 0.5.0 (2025-02-18)
+
+### Feat
+
+- update github action and project template
+- update project template and cli
+- update template and cli tools
+- update template and update cli tools
+
+### Fix
+
+- fix github action
+- use uvx prefix for all third-party commands in nox sessions
+- explicitly install pytest packages in nox sessions
+- use cookiecutter max_python_version in GitHub Actions workflows
+- add code checkout and Python setup steps to lint workflow
+- update template files to explicitly install ruff and update dev dependencies
+- explicitly install ruff in nox sessions and update dev dependencies
+- standardize token usage in GitHub Actions workflows
+- use token from setup workflow in bump_version workflow
+- optimize GitHub Actions workflow to avoid pip cache warning in root project
+- optimize GitHub Actions workflow to avoid pip cache warning
+
+### Refactor
+
+- replace uvx with uv run in noxfile.py
+- remove explicit pytest package installation as uvx handles it
+
 ## 0.4.1 (2025-02-16)
 
 ### Fix

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "repo-scaffold"
-version = "0.4.1"
+version = "0.5.0"
 description = "shawn deng repo temple project"
 authors = [
     {name = "shawndeng", email = "[email protected]"}