Merge pull request #162 from entelecheia/main

.envrc

@@ -3,7 +3,7 @@ export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
 export PROJECT_NAME="dotfiles"
 PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export PROJECT_ROOT
-VIRTUAL_ENV="${WORKON_HOME}/${PROJECT_NAME}"
+VIRTUAL_ENV="./.venv"
 if [ -e "${VIRTUAL_ENV}/bin/activate" ]; then
     # shellcheck disable=SC1091
     source "${VIRTUAL_ENV}/bin/activate"

.github/workflows/release.yaml

@@ -10,50 +10,36 @@ on:
     types:
       - completed
 
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
 jobs:
-  build:
-    # Name the Job
-    name: semantic-release
+  release:
     # check if the workflow result is success
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
-    # Set the agent to run on
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: [3.9]
+    runs-on: ubuntu-latest
+    concurrency: release
+
+    permissions:
+      id-token: write
+      contents: write
 
-    # Load all steps #
     steps:
-      # Checkout the code base #
-      - name: Checkout Code
+      # Note: we need to checkout the repository at the workflow sha in case during the workflow
+      # the branch was updated. To keep PSR working with the configured release branches,
+      # we force a checkout of the desired release branch but at the workflow sha HEAD.
+      - name: Setup | Checkout Repository at workflow sha
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.sha }}
 
-      # set env variable
-      - name: Set env variable
-        run: echo "BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
-
-      # install poetry
-      - name: Install poetry
-        run: pipx install poetry>=1.3.2
-
-      # install dependencies
-      - name: Install dependencies
-        run: poetry install --with dev
-
-      - name: Python Semantic Release to PyPI
+      - name: Setup | Force correct release branch on workflow sha
         run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "[email protected]"
-          poetry run semantic-release --verbose publish
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPOSITORY_USERNAME: __token__
-          REPOSITORY_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+          git checkout -B ${{ github.ref_name }} ${{ github.sha }}
+
+      - name: Action | Semantic Version Release
+        id: release
+        # Adjust tag with desired version if applicable.
+        uses: python-semantic-release/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          git_committer_name: "github-actions"
+          git_committer_email: "[email protected]"

.gitignore

@@ -16,6 +16,7 @@ __pycache__/
 pytest_cache/
 pytest.xml
 .mypy_cache/
+.venv/
 
 # Coverage
 .coverage

.python-version

@@ -0,0 +1 @@
+3.12

CHANGELOG.md

@@ -1,5 +1,62 @@
 <!--next-version-placeholder-->
 
+## v0.41.4 (2024-10-20)
+
+### Bug Fixes
+
+* fix(semantic_release): clean up commented configuration settings ([`921af6e`](https://github.com/entelecheia/dotfiles/commit/921af6ee391bbe0221e504f580acf852b0073029))
+
+
+## v0.41.3 (2024-10-20)
+
+### Bug Fixes
+
+* fix(pyproject): update version source for chezmoi data file ([`fb84d74`](https://github.com/entelecheia/dotfiles/commit/fb84d7400ebdf8bd7deb48e6966adb1b85ccc229))
+
+
+## v0.41.2 (2024-10-20)
+
+### Bug Fixes
+
+* fix(release): enable commit in release workflow ([`3f3c74c`](https://github.com/entelecheia/dotfiles/commit/3f3c74c09dc1af5ff006bcf00e18e5398a065e07))
+
+
+## v0.41.1 (2024-10-20)
+
+### Bug Fixes
+
+* fix(build): improve version update command in build process ([`791f5fe`](https://github.com/entelecheia/dotfiles/commit/791f5feff64725630dad514db4f1e2eb6ca02ea9))
+
+### Chores
+
+* chore(chezmoi): update DOTFILES_VERSION to 0.41.0 ([`cff96c1`](https://github.com/entelecheia/dotfiles/commit/cff96c16d9ccbeba6970afd635143f3ba0c7efcb))
+
+
+## v0.41.0 (2024-10-20)
+
+### Chores
+
+* chore(release): remove unused upload step from workflow ([`221457b`](https://github.com/entelecheia/dotfiles/commit/221457b20ffcc882978460e3cc77ac97b72856fa))
+
+* chore(workflow): simplify release pipeline configuration ([`63157ed`](https://github.com/entelecheia/dotfiles/commit/63157ed1a1c3845ebdac615d512861d2f7212053))
+
+### Features
+
+* feat(dependencies): upgrade python-semantic-release to 9.0.0 ([`981a54f`](https://github.com/entelecheia/dotfiles/commit/981a54fe7b73260a142735c5c5304fe585d750ec))
+
+
+## v0.40.0 (2024-10-19)
+
+### Feature
+
+* **chezmoi:** Add uv installation support with script and version check ([`ce7df96`](https://github.com/entelecheia/dotfiles/commit/ce7df962c56fff7ce4f290ee0d0239a1feef8579))
+
+### Fix
+
+* **workflow:** Allow manual trigger for semantic-release job ([`e348f87`](https://github.com/entelecheia/dotfiles/commit/e348f876d13dde78b1661c20ae23df6b0ab9e4b0))
+* **chezmoi:** Update user packages to include 'uv' in the template ([`7417d5c`](https://github.com/entelecheia/dotfiles/commit/7417d5cf5eaf332c8682a395914b63312a2595a6))
+* **workflow:** Change trigger branch for deploy-docs workflow from main to docs ([`5950057`](https://github.com/entelecheia/dotfiles/commit/5950057065ad1976dba426e0656ac04f5a490436))
+
 ## v0.39.5 (2024-07-18)
 
 ### Fix

chezmoi/.chezmoidata.yaml

@@ -1,4 +1,4 @@
-DOTFILES_VERSION: 0.39.5
+DOTFILES_VERSION: 0.41.4
 packages:
   - name: 1password-cli
     apt: true