Merge branch 'release/1.1.1'

Intreecom · Sep 3, 2023 · f460eae · f460eae
2 parents e6ac00e + 0e039bf
commit f460eae
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 23 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,9 +1,4 @@
-# This file is autogenerated by maturin v1.1.0
-# To update, run
-#
-#    maturin generate-ci github --pytest --platform linux --platform macos --platform windows -m Cargo.toml --output .github/workflows/ci.yaml
-#
-name: CI
+name: Release
 
 on:
   push:
@@ -129,10 +124,45 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  musllinux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - x86_64-unknown-linux-musl
+          - i686-unknown-linux-musl
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          architecture: x64
+      - name: Instal OpenSSL
+        run: sudo apt-get update && sudo apt-get install libssl-dev openssl
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist
+          sccache: 'true'
+          manylinux: musllinux_1_2
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
+      - name: Releasing assets
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            dist/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: [linux, windows, macos, sdist]
+    needs: [linux, windows, macos, musllinux, sdist]
     steps:
       - uses: actions/download-artifact@v3
         with:

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scyllapy"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 
 [lib]

diff --git a/README.md b/README.md
@@ -21,21 +21,6 @@ maturin build --release --out dist
 pip install dist/*
 ```
 
-## For Alpine users
-
-The binaries for `linux-musl` target are not yet ready. But you can easily build
-the whl file by yourself.
-
-```bash
-apk add musl-dev libressl-dev rust cargo
-export X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=1
-
-pip install scyllapy
-
-# Or you can build wheel to install it later.
-pip wheel scyllapy
-```
-
 ## Usage
 
 The usage is pretty straitforward. Create a Scylla instance, run startup and start executing queries.