Merge pull request #287 from ikalnytskyi/chore/ci-cd-improvements-fixes

A bunch of CI/CD improvements and fixes
ikalnytskyi · Dec 25, 2024 · 40a0799 · 40a0799
2 parents 5dd1cd0 + 5f4bc4a
commit 40a0799
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 19 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -6,22 +6,49 @@ on:
       - '[1-9]+.[0-9]+.[0-9]+*'
 
 jobs:
-  pypi:
+  build:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
 
-      - name: Set up Python
-        uses: actions/setup-python@v4
+      - name: Setup build dependencies
+        run: pip install build
+
+      - name: Build package
+        run: python -m build
+
+      - name: Store built python package distributions
+        uses: actions/upload-artifact@v4
         with:
-          python-version: "3.11"
+          name: python-package-distributions
+          path: dist/
 
-      - name: Install dependencies
-        run: pipx install hatch
+  publish-pypi:
+    needs: build
+    runs-on: ubuntu-latest
 
-      - name: Build
-        run: hatch build
+    permissions:
+      id-token: write
+
+    environment:
+      name: pypi
+      url: https://pypi.org/project/picobox/${{ github.ref_name }}/
+
+    steps:
+      - name: Download previously built python package distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
 
       - name: Publish to PyPI
-        run: hatch publish --user __token__ --auth ${{ secrets.PYPI_TOKEN }}
+        uses: pypa/gh-action-pypi-publish@93e87954aa8d40d7467c30656ba421aee00d37c8
+        with:
+          print-hash: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,33 +11,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
+
+      - name: Set up Hatch
+        run: python3 -m pip install hatch
 
       - name: Lint
-        run: pipx run -- hatch run lint:check
+        run: hatch run lint:check
         env:
           RUFF_OUTPUT_FORMAT: github
 
   test:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Set up Hatch
+        run: python3 -m pip install hatch
+
       - name: Test
-        run: pipx run -- hatch run test:run
+        run: hatch run test:run
 
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]