Fix: CI release (#36)

Author: thekaveman

.devcontainer/Dockerfile.dist

@@ -4,7 +4,7 @@ WORKDIR /builder
 
 COPY . .
 RUN pip install -e .[dist]
-RUN ./bin/package.sh
+RUN pyinstaller --onefile pyinstaller_entrypoint.py --name hashfields
 
 FROM python:3.11
 

.github/workflows/pypi.yml

@@ -4,10 +4,14 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - "202[2-9].0[1-9].[1-9]" # 2022.02.2
-      - "202[2-9].0[1-9].[1-9][0-9]" # 2022.02.22
-      - "202[2-9].1[0-2].[1-9]" # 2022.11.1
-      - "202[2-9].1[0-2].[1-9][0-9]" # 2022.11.11
+      - "202[3-9].0[1-9].[1-9]" # 2023.02.2
+      - "202[3-9].0[1-9].[1-9]-rc[0-9]+" # 2023.02.2-rc1
+      - "202[3-9].0[1-9].[1-9][0-9]" # 2023.02.22
+      - "202[3-9].0[1-9].[1-9][0-9]-rc[0-9]+" # 2023.02.22-rc1
+      - "202[3-9].1[0-2].[1-9]" # 2023.11.1
+      - "202[3-9].1[0-2].[1-9]-rc[0-9]+" # 2023.11.1-rc1
+      - "202[3-9].1[0-2].[1-9][0-9]" # 2023.11.11
+      - "202[3-9].1[0-2].[1-9][0-9]-rc[0-9]+" # 2023.11.11-rc1
 
 defaults:
   run:
@@ -39,18 +43,15 @@ jobs:
         run: ./bin/coverage.sh
 
       - name: Package
-        run: ./bin/package.sh
+        run: pyinstaller --onefile pyinstaller_entrypoint.py --name hashfields
 
       - name: Make artifact path
         id: make-path
         env:
           ref: ${{ github.ref }}
-          os: ${{ matrix.os }}
+          runner: ${{ runner.os }}
         run: |
-          # strip off the -latest, replace ubuntu with linux
-          os=${os/-latest/}
-          os=${os/ubuntu/linux}
-          echo "path=hashfields-${ref/refs\/tags\//}-${os}.zip" >> $GITHUB_OUTPUT
+          echo "path=hashfields-${ref/refs\/tags\//}-${runner}.zip" >> $GITHUB_OUTPUT
 
       - name: Zip (Linux)
         if: runner.os != 'Windows'
@@ -80,18 +81,64 @@ jobs:
 
     needs: package
 
+    permissions:
+      # https://github.com/softprops/action-gh-release#permissions
+      contents: write
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - uses: actions/setup-python@v4
+        with:
+          python-version-file: .github/workflows/.python-version
+          cache: pip
+          cache-dependency-path: "**/pyproject.toml"
+
+      - name: Install build dependencies
+        run: pip install -e .[dist]
+
+      - name: Build package
+        run: |
+          python -m build
+          ls -al ./dist
+
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
           name: package
           path: ./package
 
+      - name: Check artifacts
+        run: |
+          ls -al ./package
+
       - name: Release
+        id: release
         uses: softprops/action-gh-release@v1
         with:
-          files: "./package/*.zip"
-          token: ${{ secrets.PAT_RELEASE }}
+          files: |
+            ./dist/*.whl
+            ./dist/*.tar.gz
+            ./package/*.zip
+          prerelease: ${{ contains(github.ref, '-rc') }}
+          generate_release_notes: ${{ !contains(github.ref, '-rc') }}
+
+      - name: Publish to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1.5
+        if: ${{ contains(github.ref, '-rc') }}
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TEST_API_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/
+          print_hash: true
+          skip_existing: true
+          verbose: true
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1.5
+        if: ${{ !contains(github.ref, '-rc') }}
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          print_hash: true

.github/workflows/release.yml

@@ -34,7 +34,7 @@ Or package the app for your current system:
 ```console
 pip install -e .[dist]
 
-./bin/package.sh
+pyinstaller --onefile pyinstaller_entrypoint.py --name hashfields
 ```
 
 The resulting executable is located at `./dist/hashfields`:

bin/package.sh

@@ -1 +1 @@
-__version__ = "2023.08.4"
+__version__ = "2023.09.1"

docs/development.md

@@ -0,0 +1,7 @@
+"""Pyinstaller entrypoint for the CLI."""
+
+from hashfields.main import main
+
+
+if __name__ == "__main__":
+    main()