From 912a1fd209003806c02138719efdc2d29bd29e6e Mon Sep 17 00:00:00 2001
From: Federico Terzi <federicoterzi96@gmail.com>
Date: Sun, 3 Oct 2021 18:29:10 +0200
Subject: [PATCH] fix(ci): preserve rustup-related env-vars in ci build and fix
 a few errors

---
 .github/scripts/ubuntu/Dockerfile |  8 ++++----
 .github/workflows/release.yml     | 10 +++++-----
 scripts/build_binary.rs           |  2 +-
 scripts/test_binary.rs            |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/scripts/ubuntu/Dockerfile b/.github/scripts/ubuntu/Dockerfile
index 899b46b..6fbba6e 100644
--- a/.github/scripts/ubuntu/Dockerfile
+++ b/.github/scripts/ubuntu/Dockerfile
@@ -3,7 +3,8 @@ FROM ubuntu:18.04
 RUN apt-get update \
     && apt-get install -y libssl-dev \
     libxdo-dev libxtst-dev libx11-dev \
-    wget git cmake build-essential pkg-config
+    libxkbcommon-dev libwxgtk3.0-gtk3-dev libdbus-1-dev \
+    wget git file build-essential pkg-config
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
@@ -30,9 +31,8 @@ RUN set -eux; \
     cargo --version; \
     rustc --version;
 
-RUN mkdir espanso
+RUN mkdir espanso && cargo install --force cargo-make
 
 COPY . espanso
 
-RUN cd espanso \
-    && cargo install --force cargo-make
+RUN cd espanso
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 61ebb65..00d0380 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         name: "Upload artifacts"
         with:
-          name: Windows Installer and Portable
+          name: Windows Artifacts
           path: |
             target/windows/installer/Espanso-Win-Installer-x86_64.exe
             target/windows/Espanso-Win-Portable-x86_64.zip
@@ -89,13 +89,13 @@ jobs:
       - uses: actions/upload-artifact@v2
         name: "Upload artifacts"
         with:
-          name: Linux X11 AppImage
+          name: Linux X11 Artifacts
           path: |
-            shared/Espanso-X11.AppImage
-            shared/Espanso-X11.AppImage.sha256.txt
+            Espanso-X11.AppImage
+            Espanso-X11.AppImage.sha256.txt
       - name: Upload artifacts to Github Releases
         run: |
-          gh release upload ${{ needs.extract-version.outputs.espanso_version }} shared/Espanso-X11.AppImage shared/Espanso-X11.AppImage.sha256.txt
+          gh release upload ${{ needs.extract-version.outputs.espanso_version }} Espanso-X11.AppImage Espanso-X11.AppImage.sha256.txt
   # macos-intel:
   #   runs-on: macos-11
 
diff --git a/scripts/build_binary.rs b/scripts/build_binary.rs
index 0c17995..fa316ed 100644
--- a/scripts/build_binary.rs
+++ b/scripts/build_binary.rs
@@ -71,7 +71,7 @@ fn main() {
   // nested cargo build call.
   let all_vars = envmnt::vars();
   for (key, _) in all_vars {
-    if key.starts_with("CARGO") || key.starts_with("RUST") {
+    if key.starts_with("CARGO") || (key.starts_with("RUST") && !key.starts_with("RUSTUP")) {
       //println!("Removing {}", key);
       cmd.env_remove(key);
     }
diff --git a/scripts/test_binary.rs b/scripts/test_binary.rs
index 31de66f..876bc5e 100644
--- a/scripts/test_binary.rs
+++ b/scripts/test_binary.rs
@@ -64,7 +64,7 @@ fn main() {
   // nested cargo build call.
   let all_vars = envmnt::vars();
   for (key, _) in all_vars {
-    if key.starts_with("CARGO") || key.starts_with("RUST") {
+    if key.starts_with("CARGO") || (key.starts_with("RUST") && !key.starts_with("RUSTUP")) {
       //println!("Removing {}", key);
       cmd.env_remove(key);
     }