Merge pull request #73 from Decompollaborate/develop

1.12.4

.github/workflows/pypi_upload.yml

@@ -1,20 +1,24 @@
+# Based on https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml
+# Permalink: https://github.com/pypa/cibuildwheel/blob/9c75ea15c2f31a77e6043b80b1b7081372319d85/examples/github-deploy.yml
+
 name: Build and upload to PyPI
 
 # Only run on releases
-on:
-  push:
-    # Pattern matched against refs/tags
-    tags:
-      - '**'           # Push events to every tag including hierarchical tags like v1.0/beta
-# on: [push, pull_request]
+# on:
+#   push:
+#     # Pattern matched against refs/tags
+#     tags:
+#       - '**'           # Push events to every tag including hierarchical tags like v1.0/beta
+on: [push, pull_request]
 
 jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-20.04, macos-13, macos-14, windows-latest]
 
     steps:
       - name: Checkout reposistory
@@ -35,6 +39,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -50,21 +55,27 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: dist/*.tar.gz
 
   upload_pypi:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-20.04
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    environment: pypi
+    permissions:
+      id-token: write
     steps:
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:
-          name: artifact
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
       - name: Publish to PyPI
-        uses: pypa/[email protected]
+        uses: pypa/gh-action-pypi-publish@release/v1
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.12.4] - 2024-12-16
+
+### Fixed
+
+- Try to fix Python releases again, again.
+  - Why are we still here? Just to suffer?
+
 ## [1.12.3] - 2024-12-16
 
 ### Fixed
@@ -688,6 +695,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - First version
 
 [unreleased]: https://github.com/Decompollaborate/rabbitizer/compare/master...develop
+[1.12.4]: https://github.com/Decompollaborate/rabbitizer/compare/1.12.3...1.12.4
 [1.12.3]: https://github.com/Decompollaborate/rabbitizer/compare/1.12.2...1.12.3
 [1.12.2]: https://github.com/Decompollaborate/rabbitizer/compare/1.12.1...1.12.2
 [1.12.1]: https://github.com/Decompollaborate/rabbitizer/compare/1.12.0...1.12.1

Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "rabbitizer"
 # Version should be synced with include/common/RabbitizerVersion.h
-version = "1.12.3"
+version = "1.12.4"
 edition = "2021"
 authors = ["Anghelo Carvajal <[email protected]>"]
 description = "MIPS instruction decoder"

README.md

@@ -69,7 +69,7 @@ If you use a `requirements.txt` file in your repository, then you can add this
 library with the following line:
 
 ```txt
-rabbitizer>=1.12.3,<2.0.0
+rabbitizer>=1.12.4,<2.0.0
 ```
 
 ### Development version
@@ -109,7 +109,7 @@ cargo add rabbitizer
 Or you can add it manually to your `Cargo.toml`:
 
 ```toml
-rabbitizer = "1.12.3"
+rabbitizer = "1.12.4"
 ```
 
 See this crate at <https://crates.io/crates/rabbitizer>.

include/common/RabbitizerVersion.h

@@ -14,7 +14,7 @@ extern "C" {
 // Header version
 #define RAB_VERSION_MAJOR 1
 #define RAB_VERSION_MINOR 12
-#define RAB_VERSION_PATCH 3
+#define RAB_VERSION_PATCH 4
 
 #define RAB_VERSION_STR RAB_STRINGIFY(RAB_VERSION_MAJOR) "." RAB_STRINGIFY(RAB_VERSION_MINOR) "." RAB_STRINGIFY(RAB_VERSION_PATCH)
 

pyproject.toml

@@ -4,7 +4,7 @@
 [project]
 name = "rabbitizer"
 # Version should be synced with include/common/RabbitizerVersion.h
-version = "1.12.3"
+version = "1.12.4"
 description = "MIPS instruction decoder"
 # license = "MIT"
 readme = "README.md"