fix tests

rocksdict · Nov 3, 2024 · b2d4350 · b2d4350
1 parent 1ec6b95
commit b2d4350
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 65 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -5,7 +5,7 @@ on:
     types: [published]
 
 jobs:
-  musllinux_1_2_x86_64_build:
+  musllinux_1_2_x86_64:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -41,13 +41,19 @@ jobs:
           RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
           LLVM_CONFIG_PATH: /root/llvm_config.sh
           LIBCLANG_STATIC_PATH: /usr/local/lib
+      - name: Run Tests
+        run: |
+          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_x86_64:llvm-19.1.3 bash -c "
+            pip install rocksdict --no-index --find-links /dist --force-reinstall || true
+            pip install speedict --no-index --find-links /dist --force-reinstall || true
+            python -m unittest discover -v /test"
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: wheels-musllinux_1_2-x86_64
           path: dist
 
-  musllinux_1_2_arm64_build:
+  musllinux_1_2_arm64:
     runs-on: linux-arm64
     strategy:
       fail-fast: false
@@ -83,47 +89,22 @@ jobs:
           RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
           LLVM_CONFIG_PATH: /root/llvm_config.sh
           LIBCLANG_STATIC_PATH: /usr/local/lib
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-musllinux_1_2-arm64
-          path: dist
-
-  musllinux_1_2_x86_64_test:
-    runs-on: ubuntu-latest
-    needs: musllinux_1_2_x86_64_build
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v4
-        with:
-          name: wheels-musllinux_1_2-x86_64
-          path: dist
-      - name: Run musllinux x86_64 tests
+      - name: Run Tests
         run: |
-          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_x86_64:llvm-19.1.3 bash -c "
+          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_aarch64:llvm-19.1.3 bash -c "
             pip install rocksdict --no-index --find-links /dist --force-reinstall || true
             pip install speedict --no-index --find-links /dist --force-reinstall || true
             python -m unittest discover -v /test"
-
-  musllinux_1_2_arm64_test:
-    runs-on: linux-arm64
-    needs: musllinux_1_2_arm64_build
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v4
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
           name: wheels-musllinux_1_2-arm64
           path: dist
-      - name: Run musllinux arm64 tests
-        run: |
-          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_aarch64:llvm-19.1.3 bash -c "
-            pip install rocksdict --no-index --find-links /dist --force-reinstall || true
-            pip install speedict --no-index --find-links /dist --force-reinstall || true
-            python -m unittest discover -v /test"
+
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: [musllinux_1_2_x86_64_test, musllinux_1_2_arm64_test]
+    needs: [musllinux_1_2_x86_64, musllinux_1_2_arm64]
     steps:
       - uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -5,7 +5,7 @@ on:
     branches: [musl]
 
 jobs:
-  musllinux_1_2_x86_64_build:
+  musllinux_1_2_x86_64:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -41,13 +41,19 @@ jobs:
           RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
           LLVM_CONFIG_PATH: /root/llvm_config.sh
           LIBCLANG_STATIC_PATH: /usr/local/lib
+      - name: Run Tests
+        run: |
+          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_x86_64:llvm-19.1.3 bash -c "
+            pip install rocksdict --no-index --find-links /dist --force-reinstall || true
+            pip install speedict --no-index --find-links /dist --force-reinstall || true
+            python -m unittest discover -v /test"
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: wheels-musllinux_1_2-x86_64
           path: dist
 
-  musllinux_1_2_arm64_build:
+  musllinux_1_2_arm64:
     runs-on: linux-arm64
     strategy:
       fail-fast: false
@@ -83,40 +89,14 @@ jobs:
           RUSTFLAGS: "-Clinker-plugin-lto -Clinker=/usr/local/bin/clang -Clink-arg=-fuse-ld=/usr/local/bin/ld.lld"
           LLVM_CONFIG_PATH: /root/llvm_config.sh
           LIBCLANG_STATIC_PATH: /usr/local/lib
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-musllinux_1_2-arm64
-          path: dist
-
-  musllinux_1_2_x86_64_test:
-    runs-on: ubuntu-latest
-    needs: musllinux_1_2_x86_64_build
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v4
-        with:
-          name: wheels-musllinux_1_2-x86_64
-          path: dist
-      - name: Run musllinux x86_64 tests
+      - name: Run Tests
         run: |
-          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_x86_64:llvm-19.1.3 bash -c "
+          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_aarch64:llvm-19.1.3 bash -c "
             pip install rocksdict --no-index --find-links /dist --force-reinstall || true
             pip install speedict --no-index --find-links /dist --force-reinstall || true
             python -m unittest discover -v /test"
-
-  musllinux_1_2_arm64_test:
-    runs-on: linux-arm64
-    needs: musllinux_1_2_arm64_build
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v4
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
           name: wheels-musllinux_1_2-arm64
           path: dist
-      - name: Run musllinux arm64 tests
-        run: |
-          docker run --rm -v ${{ github.workspace }}/dist:/dist:ro -v ${{ github.workspace }}/test:/test:ro congyuwang/musllinux_1_2_aarch64:llvm-19.1.3 bash -c "
-            pip install rocksdict --no-index --find-links /dist --force-reinstall || true
-            pip install speedict --no-index --find-links /dist --force-reinstall || true
-            python -m unittest discover -v /test"