Update CD workflows to use use cross

.github/workflows/cd.yml

@@ -21,49 +21,33 @@ jobs:
             target: aarch64-apple-darwin
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            container: rust
-            dependencies: "libssl-dev libasound2-dev libdbus-1-dev"
+            dependencies: "libssl-dev"
           - os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
-            container: rustembedded/cross:aarch64-unknown-linux-gnu
-            cross_arch: "arm64"
-            pkg_config_path: "/usr/lib/aarch64-linux-gnu/pkgconfig/"
-            dependencies: "libssl-dev:arm64 libasound2-dev:arm64 libdbus-1-dev:arm64"
+            cross_arch: true
           - os: ubuntu-latest
             target: armv7-unknown-linux-gnueabihf
-            cross_arch: "armhf"
-            pkg_config_path: "/usr/lib/arm-linux-gnueabihf/pkgconfig/"
-            container: rustembedded/cross:armv7-unknown-linux-gnueabihf
-            dependencies: "libssl-dev:armhf libasound2-dev:armhf libdbus-1-dev:armhf"
+            cross_arch: true
           - os: windows-latest
             target: x86_64-pc-windows-msvc
 
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
 
-      - name: Set up cross compilation
-        if: matrix.cross_arch
-        run: |
-          dpkg --add-architecture ${{ matrix.cross_arch }}
-          echo "PKG_CONFIG_PATH=${{ matrix.pkg_config_path }}" >> $GITHUB_ENV
-          echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
-
       - name: Install Linux dependencies
         if: matrix.dependencies
-        run: apt update && apt install -y ${{ matrix.dependencies }}
+        run: sudo apt-get update && sudo apt-get install -y ${{ matrix.dependencies }}
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
-          profile: minimal
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
 
       - name: Build
         uses: actions-rs/cargo@v1
         with:
+          use-cross: ${{ matrix.cross_arch }}
           command: build
           args: --locked --release --target ${{ matrix.target }}
 

Cross.toml

@@ -0,0 +1,11 @@
+[build.env]
+passthrough = [
+  "CROSS_DEBUG",
+  "RUST_BACKTRACE",
+]
+
+[target.aarch64-unknown-linux-gnu]
+dockerfile = "./ci/Dockerfile-cross"
+
+[target.armv7-unknown-linux-gnueabihf]
+dockerfile = "./ci/Dockerfile-cross"

ci/Dockerfile-cross

@@ -0,0 +1,7 @@
+ARG CROSS_BASE_IMAGE
+FROM $CROSS_BASE_IMAGE
+
+ARG CROSS_DEB_ARCH
+RUN dpkg --add-architecture $CROSS_DEB_ARCH && \
+    apt-get update && \
+    apt-get install -y libssl-dev:$CROSS_DEB_ARCH

hackernews_tui/src/parser/mod.rs

@@ -2,4 +2,4 @@ mod article;
 mod html;
 mod rcdom;
 
-pub use {article::*, html::*};
+pub use html::*;