From ec293b4fb2f96ba0563c2926d67aecf58f3946a7 Mon Sep 17 00:00:00 2001
From: Andy Smith <andrewphilipsmith@users.noreply.github.com>
Date: Sun, 15 Dec 2024 15:27:10 +0000
Subject: [PATCH] Re-enable manylinux publish

---
 .github/workflows/python.yml | 84 ++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 12a7659..4b276e6 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -77,41 +77,49 @@ jobs:
           path: dist
 
   # TODO: fix CI to run with manylinux: musllinux_1_2
-  # musllinux:
-  #   runs-on: ${{ matrix.platform.runner }}
-  #   strategy:
-  #     matrix:
-  #       platform:
-  #         - runner: ubuntu-latest
-  #           target: x86_64
-  #         - runner: ubuntu-latest
-  #           target: x86
-  #         - runner: ubuntu-latest
-  #           target: aarch64
-  #         - runner: ubuntu-latest
-  #           target: armv7
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/setup-python@v5
-  #       with:
-  #         python-version: ${{ env.PYTHON_VERSION }}
-  #     - name: Build wheels
-  #       uses: PyO3/maturin-action@v1
-  #       with:
-  #         target: ${{ matrix.platform.target }}
-  #         args: --release --out dist --find-interpreter --manifest-path popgetter_py/Cargo.toml
-  #         sccache: "true"
-  #         before-script-linux: |
-  #             # TODO: update with package instructions specific to target for openssl
-  #             # See example: https://github.com/PyO3/maturin-action/discussions/162#discussioncomment-7978369
-  #             sudo apt-get update
-  #             sudo apt-get install -y pkg-config libssl-dev
-  #         manylinux: musllinux_1_2
-  #     - name: Upload wheels
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: wheels-musllinux-${{ matrix.platform.target }}
-  #         path: dist
+  # -- TESTING MANYLINUX CONFIGURATION --
+
+  musllinux:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: ubuntu-latest
+            target: x86_64
+          - runner: ubuntu-latest
+            target: x86
+          - runner: ubuntu-latest
+            target: aarch64
+          - runner: ubuntu-latest
+            target: armv7
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path popgetter_py/Cargo.toml
+          sccache: "true"
+          before-script-linux: |
+              # TODO: update with package instructions specific to target for openssl
+              # See example: https://github.com/PyO3/maturin-action/discussions/162#discussioncomment-7978369
+              sudo apt-get update
+              sudo apt-get install -y pkg-config libssl-dev
+              # For debug purposes:
+              apt show libssl-dev
+              sudo apt-get install -y apt-file
+              apt-file list libssl-dev
+          manylinux: musllinux_1_2
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-musllinux-${{ matrix.platform.target }}
+          path: dist
+
+  # -- END OF MANYLINUX CONFIGURATION --
 
   windows:
     runs-on: ${{ matrix.platform.runner }}
@@ -195,7 +203,7 @@ jobs:
     name: Release to PyPI
     runs-on: ubuntu-latest
     # TODO Re-enable after first successful run 
-    # if: "startsWith(github.ref, 'refs/tags/')"
+    if: "startsWith(github.ref, 'refs/tags/')"
     # TODO: add re-enable manylinux once earlier step is fixed
     # needs: [linux, musllinux, windows, macos, sdist]
     needs: [linux, windows, macos, sdist]
@@ -214,8 +222,8 @@ jobs:
     name: Release to TestPyPI
     runs-on: ubuntu-latest
     # TODO: add re-enable manylinux once earlier step is fixed
-    # needs: [linux, musllinux, windows, macos, sdist]
-    needs: [linux, windows, macos, sdist]
+    needs: [linux, musllinux, windows, macos, sdist]
+    # needs: [linux, windows, macos, sdist]
     environment: testpypi
     steps:
       - uses: actions/download-artifact@v4