Fixing Build Config Issues (#99)

allenai · Jan 15, 2024 · ede739f · ede739f
1 parent 41ec1ef
commit ede739f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -25,6 +25,7 @@ env:
 
 jobs:
   info:
+    name: Run info
     runs-on: ubuntu-latest
     steps:
       - name: Echo environment variables
@@ -41,6 +42,7 @@ jobs:
 
   prepare-venv:
     runs-on: ubuntu-latest
+    name: "Prepare Virtual Env"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -98,6 +100,7 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     if: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}
+    name: "${{ matrix.task.name }}"
     strategy:
       fail-fast: true
       matrix:
@@ -111,18 +114,17 @@ jobs:
             run: |
               rustfmt --edition 2021 src/*.rs --check
 
-          - name: Lint
+          - name: Lint Python
             run: |
               flake8 tests/python/ && flake8 python/
 
-          - name: Type check
+          - name: Types Python
             run: |
               mypy tests/python/ && mypy python/
 
-          - name: Test
+          - name: Run Python tests
             run: |
               pytest -vs --color=yes tests/python/
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -142,36 +144,29 @@ jobs:
           source .venv/bin/activate
           ${{ matrix.task.run }}
 
-
   build-linux:
     if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
-    env:
-      CC:   gcc-11
-      CXX:  g++-11
     strategy:
       matrix:
         target: [x86_64, x86, aarch64, armv7]
+    name: "Build Linux (${{ matrix.target }})"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-      - name: Setup environment
-        run:  |
-          sudo apt-get update
-          sudo apt-get install --yes --upgrade build-essential cmake protobuf-compiler libssl-dev glibc-source
       - name: Install 32bit version of libc
-        if: ${{ matrix.target == 'x86' }}
+        if: ${{ matrix.target == 'x86' || contains(matrix.target, 'i686') }}
         run: |
+          sudo apt-get update
           sudo apt-get install --yes --upgrade libc6-dev-i386
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
-          sccache: ${{ matrix.target == 'x86' && 'false' || 'true' }}
-          manylinux: ${{ matrix.target == 'x86' && 'auto' || '2_28' }}
+          manylinux: auto
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
@@ -181,6 +176,7 @@ jobs:
   build-windows:
     if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') }}
     runs-on: windows-latest
+    name: "Build Windows (${{ matrix.target }})"
     strategy:
       matrix:
         target: [x64, x86]
@@ -195,7 +191,6 @@ jobs:
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
-          sccache: true
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
@@ -205,6 +200,7 @@ jobs:
   build-macos:
     if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') }}
     runs-on: macos-latest
+    name: "Build macOS (${{ matrix.target }})"
     strategy:
       matrix:
         target: [x86_64, aarch64]
@@ -218,7 +214,6 @@ jobs:
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
-          sccache: true
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ aws-sdk-s3 = "0.25.0"
 byteorder = "1"
 clap = { version = "4.1.11", features = ["derive"] }
 env_logger = "0.10.0"
-flate2 = { version = "1.0", features = ["zlib-ng"], default-features = false }
+flate2 = { version = "1.0.28", features = ["zlib-ng"], default-features = false }
 jsonpath-rust = "0.3.0"
 log = "0.4.17"
 regex = "1.8.4"
@@ -30,3 +30,7 @@ tokio = {version = "1.27.0", features = ["full"]}
 tokio-util = "0.7.7"
 unicode-segmentation = "1.7"
 glob = "0.3.1"
+
+
+# [target.'cfg(target_arch = "aarch64")'.dependencies]
+# flate2 = "1.0.28"