Update CI

cds-astro · Oct 18, 2022 · 1b1c6d8 · 1b1c6d8
1 parent f1a6509
commit 1b1c6d8
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 9 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,16 +27,18 @@ jobs:
          cd crates/set
          for PYBIN in /opt/python/cp38*/bin; do
            "${PYBIN}/pip" install maturin
-           "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --no-sdist --manylinux 2014 --username "$MATURIN_USERNAME"
+           "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME"
+           "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME"
          done
          cd ../cli
          for PYBIN in /opt/python/cp38*/bin; do
            "${PYBIN}/pip" install maturin
-           "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --no-sdist --manylinux 2014 --username "$MATURIN_USERNAME"
+           "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME"
+           "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME"
          done
 
 
-  # Decomment if 32 bit asked one day... 
+  ## Decomment if 32 bit asked one day... 
   #build-linux32-wheels:
   #  runs-on: ubuntu-latest
   #  # CentOS 7 32 bits Docker Hub image that 'build-linux-wheels' executes in.
@@ -59,25 +61,58 @@ jobs:
   #       cd crates/set
   #       for PYBIN in /opt/python/cp38*/bin; do
   #         "${PYBIN}/pip" install maturin
-  #         "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --no-sdist --manylinux 2014 --username "$MATURIN_USERNAME"
+  #         "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME"
+  #         "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME"
   #       done 
   #      cd ../cli
   #       for PYBIN in /opt/python/cp38*/bin; do
   #         "${PYBIN}/pip" install maturin
-  #         "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --manylinux 2014 --username "$MATURIN_USERNAME"
+  #         "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME"
+  #         "${PYBIN}/maturin" publish -i "${PYBIN}/python" --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME"
   #       done
 
 
+
   # Deploy for Windows and MoxOS 64 bits.
   # If Windows 32 bits neede, check e.g. https://github.com/marketplace/actions/setup-msys2
-  build-macos-and-windows-wheels:      
+  build-windows-wheels:      
     runs-on: ${{ matrix.os }}
     strategy:
       # Run all matrix jobs even if one is failling (default behaviour is to stop all jobs)
       # To be changed when option --skip-existing will be available in maturin
       fail-fast: false      
       matrix:
-        os: [windows-latest, macOS-latest]
+        os: [windows-latest]
+        python-version: ['3.8']
+    steps:
+     - uses: actions/checkout@v2
+     - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
+       uses: actions/setup-python@v2
+       with:
+         python-version: ${{ matrix.python-version }}
+     - name: Build and publish wheel for Python ${{ matrix.python-version }} on ${{ matrix.os }}
+       # We do not use environement variable for user, because it seems that the way of providing it in the command
+       # line is not the same for macos and for windows. We should create 2 different actions (see 
+       # https://docs.github.com/en/actions/reference/encrypted-secrets )
+       env:
+        MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }}
+       run: |
+         pip install maturin
+         cd crates/set
+         maturin publish --interpreter python${{matrix.python_version}} --skip-existing --username fxpineau 
+         cd ../cli
+         maturin publish --interpreter python${{matrix.python_version}} --skip-existing --username fxpineau 
+
+  # Deploy for Windows and MoxOS 64 bits.
+  # If Windows 32 bits neede, check e.g. https://github.com/marketplace/actions/setup-msys2
+  build-macos-wheels:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      # Run all matrix jobs even if one is failling (default behaviour is to stop all jobs)
+      # To be changed when option --skip-existing will be available in maturin
+      fail-fast: false
+      matrix:
+        os: [macOS-latest]
         python-version: ['3.8']
     steps:
      - uses: actions/checkout@v2
@@ -90,11 +125,14 @@ jobs:
        # line is not the same for macos and for windows. We should create 2 different actions (see 
        # https://docs.github.com/en/actions/reference/encrypted-secrets )
        env:
+        MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }}
         MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }}
        run: |
+         rustup target add aarch64-apple-darwin
          pip install maturin
          cd crates/set
-         maturin publish --interpreter python${{matrix.python_version}} --skip-existing --no-sdist --username fxpineau 
+         maturin publish --interpreter python${{matrix.python_version}} --universal2 --skip-existing --username "$MATURIN_USERNAME"
          cd ../cli
-         maturin publish --interpreter python${{matrix.python_version}} --skip-existing --no-sdist --username fxpineau 
+         maturin publish --interpreter python${{matrix.python_version}} --universal2 --skip-existing --username "$MATURIN_USERNAME"
+
 
diff --git a/.github/workflows/deploy_mac.yml b/.github/workflows/deploy_mac.yml
@@ -0,0 +1,36 @@
+name: build-wheel-macosi
+
+on: [push]
+
+jobs:
+  # Deploy for Windows and MoxOS 64 bits.
+  # If Windows 32 bits neede, check e.g. https://github.com/marketplace/actions/setup-msys2
+  build-macos-wheels:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      # Run all matrix jobs even if one is failling (default behaviour is to stop all jobs)
+      # To be changed when option --skip-existing will be available in maturin
+      fail-fast: false
+      matrix:
+        os: [macOS-latest]
+        python-version: ['3.8']
+    steps:
+     - uses: actions/checkout@v2
+     - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
+       uses: actions/setup-python@v2
+       with:
+         python-version: ${{ matrix.python-version }}
+     - name: Build and publish wheel for Python ${{ matrix.python-version }} on ${{ matrix.os }}
+       # We do not use environement variable for user, because it seems that the way of providing it in the command
+       # line is not the same for macos and for windows. We should create 2 different actions (see 
+       # https://docs.github.com/en/actions/reference/encrypted-secrets )
+       env:
+        MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }}
+        MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }}
+       run: |
+         rustup target add aarch64-apple-darwin
+         pip install maturin
+         cd crates/set
+         maturin publish -b bin --interpreter python${{matrix.python_version}} --no-sdist --universal2 --skip-existing --username "$MATURIN_USERNAME"
+         cd ../cli
+         maturin publish -b bin --interpreter python${{matrix.python_version}} --no-sdist --universal2 --skip-existing --username "$MATURIN_USERNAME"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,6 +56,7 @@ jobs:
           #- { os: ubuntu-latest, cross: true, toolchain: stable, target: x86_64-linux-android }   
           # Macos
           - { os: macos-latest, cross: false, toolchain: stable, target: x86_64-apple-darwin }
+          - { os: macos-latest, cross: false, toolchain: stable, target: aarch64-apple-darwin }
           # iOS
           #- { os: macos-latest, cross: false, toolchain: stable, target: aarch64-apple-ios }
           #- { os: macos-latest, cross: false, toolchain: stable, target: x86_64-apple-ios }
@@ -139,6 +140,7 @@ jobs:
           #- { os: ubuntu-latest, cross: true, toolchain: stable, target: x86_64-linux-android }   
           # Macos
           - { os: macos-latest, cross: false, toolchain: stable, target: x86_64-apple-darwin }
+          - { os: macos-latest, cross: false, toolchain: stable, target: aarch64-apple-darwin }
           # iOS
           #- { os: macos-latest, cross: false, toolchain: stable, target: aarch64-apple-ios }
           #- { os: macos-latest, cross: false, toolchain: stable, target: x86_64-apple-ios }