v0.0.3

bodrovis-learning · May 3, 2024 · 08438f5 · 08438f5
1 parent 0a80e24
commit 08438f5
Showing 1 changed file with 20 additions and 42 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,28 +25,22 @@ jobs:
     strategy:
       matrix:
         include:
-          # - target: aarch64-apple-darwin
-          #   os: macos-latest
-          # - target: x86_64-unknown-linux-gnu
-          #   os: ubuntu-latest
-          # - target: x86_64-unknown-linux-musl
-          #   os: ubuntu-latest
-          - target: aarch64-unknown-linux-gnu
+          - target: aarch64-apple-darwin
+            os: macos-latest
+          - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
-          # - target: arm-unknown-linux-gnueabi
-          #   os: ubuntu-latest
-          # # - target: x86_64-unknown-linux-gnu
-          # #   os: ubuntu-20.04
-          # - target: x86_64-apple-darwin
-          #   os: macos-latest
-          # - target: universal-apple-darwin
-          #   os: macos-latest
-          # - target: x86_64-pc-windows-msvc
-          #   os: windows-latest
-          # - target: i686-pc-windows-msvc
-          #   os: windows-latest
-          # - target: aarch64-pc-windows-msvc
-          #   os: windows-latest
+          # - target: x86_64-unknown-linux-gnu
+          #   os: ubuntu-20.04
+          - target: x86_64-apple-darwin
+            os: macos-latest
+          - target: universal-apple-darwin
+            os: macos-latest
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+          - target: i686-pc-windows-msvc
+            os: windows-latest
+          - target: aarch64-pc-windows-msvc
+            os: windows-latest
     runs-on: ${{ matrix.os }}
     env:
       ENABLE_RUNTIME_TESTS: false
@@ -58,28 +52,12 @@ jobs:
         with:
           target: ${{ matrix.target }}
         if: startsWith(matrix.os, 'ubuntu')
-      - name: Install musl-tools on Linux
-        run: sudo apt-get update --yes && sudo apt-get install --yes musl-tools
-        if: contains(matrix.target, 'musl')
-      # - name: Install tools
-      #   run: sudo apt-get update --yes && sudo apt-get install --yes libxi-dev libx11-dev libxcb1 libxrandr2 libdbus-1-3 libxtst-dev
-      #   if: contains(matrix.os, 'ubuntu')
-      - name: Prepare arm64 repositories
-        run: |
-          sudo tee /etc/apt/sources.list <<-EOF
-          deb [arch=arm64] http://ports.ubuntu.com/ focal main restricted universe multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ focal-updates main restricted universe multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ focal-backports main restricted universe multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ focal-security main restricted universe multiverse
-          EOF
-          export PKG_CONFIG_SYSROOT_DIR=/
-        if: contains(matrix.target, 'aarch64-unknown-linux')
+      # - name: Install musl-tools on Linux
+      #   run: sudo apt-get update --yes && sudo apt-get install --yes musl-tools
+      #   if: contains(matrix.target, 'musl')
       - name: Install tools
-        run: |
-          sudo dpkg --add-architecture arm64
-          sudo apt-get update --yes
-          sudo apt-get install --yes libxi-dev:arm64 libx11-dev:arm64 libxcb1:arm64 libxrandr2:arm64 libdbus-1-3:arm64 libxtst-dev:arm64
-        if: contains(matrix.target, 'aarch64-unknown-linux')
+        run: sudo apt-get update --yes && sudo apt-get install --yes libxi-dev libx11-dev libxcb1 libxrandr2 libdbus-1-3 libxtst-dev
+        if: contains(matrix.os, 'ubuntu')
       - uses: taiki-e/upload-rust-binary-action@v1
         with:
           # (required) Comma-separated list of binary names (non-extension portion of filename) to build and upload.