workaround

Signed-off-by: Esteban Blanc <[email protected]>
Skallwar · Oct 10, 2023 · c52e952 · c52e952
1 parent 93d865f
commit c52e952
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -74,7 +74,7 @@ jobs:
           - riscv64gc-unknown-linux-gnu
         rust:
           - stable
-          - 1.67.0
+          - 1.63.0
         os:
           - ubuntu-latest
 
@@ -99,35 +99,25 @@ jobs:
         sudo apt install libssl-dev
 
     # - name: Install libssl (cross)
-    #   uses: ryankurte/action-apt@master
+    #   uses: ryankurte/action-apt@v0.3.0
     #   if: ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
     #   with:
     #     arch: ${{ env.MULTILIB_ARCH }}
     #     packages: "${{ env.UBUNTU_CROSS_PKG_LIST }} libssl-dev:${{ env.MULTILIB_ARCH }}"
-
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-
-    - name: Install libssl (cross aarch64)
-      if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
-      run: |
-        sudo dpkg --add-architecture arm64
-        sudo sed 's/deb http/deb \[arch=amd64,i386\] http/' -i /etc/apt/sources.list
-        sudo bash -c 'echo >/etc/apt/sources.list <<EOF
-          deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs) main universe restricted multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main universe restricted multiverse
-          deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-security main universe restricted multiverse
-        EOF'
-        sudo apt update
-        sudo apt install libssl-dev:arm64
 
-    - name: Install libssl (cross riscv64gc)
-      if: ${{ matrix.target == 'riscv64gc-unknown-linux-gnu' }}
+    - name: Install libssl (cross)
+      if: ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
       run: |
-        sudo dpkg --add-architecture riscv64
+        sudo dpkg --add-architecture ${{ env.MULTILIB_ARCH }}
+        sudo sed -i'' -E 's/^(deb|deb-src) /\1 [arch=amd64,i386] /' /etc/apt/sources.list
+        echo "deb [arch=${{ env.MULTILIB_ARCH }}] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -cs) main restricted universe" | sudo tee /etc/apt/sources.list.d/${{ env.MULTILIB_ARCH }}.list
+        echo "deb [arch=${{ env.MULTILIB_ARCH }}] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -cs)-updates main restricted universe" | sudo tee -a /etc/apt/sources.list.d/${{ env.MULTILIB_ARCH }}.list
+        echo "deb [arch=${{ env.MULTILIB_ARCH }}] http://ports.ubuntu.com/ubuntu-ports/ $(lsb_release -cs)-security main restricted universe" | sudo tee -a /etc/apt/sources.list.d/${{ env.MULTILIB_ARCH }}.list
         sudo apt update
-        sudo apt install libssl-dev:riscv64
+        sudo apt install ${{ env.UBUNTU_CROSS_PKG_LIST }} libssl-dev:${{ env.MULTILIB_ARCH }}
 
+          #- name: Setup tmate session
+          #uses: mxschmitt/action-tmate@v3
 
     - name: Check
       run: cargo check --locked --target ${{ matrix.target }}