fix(ci-rs.yml): attempt to fix problem with docker test

miniben-90 · Aug 6, 2024 · f6a5c30 · f6a5c30
1 parent 63aa9cf
commit f6a5c30
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/docker-ubuntu-rust-install.sh b/.github/docker-ubuntu-rust-install.sh
@@ -1,5 +1,17 @@
 #!bin/bash
 
+Xvfb :0 &
+
+sleep 1
+
+gpg-agent --daemon
+
+sleep 1
+
+xfce4-session &
+
+sleep 1
+
 curl https://sh.rustup.rs -sSf | bash -s -- -y
 
 sudo apt install musl-tools -y

diff --git a/.github/workflows/ci-rs.yml b/.github/workflows/ci-rs.yml
@@ -117,14 +117,7 @@ jobs:
         with:
           image: ${{ matrix.settings.image }}
           options: --user 0:0 -e CARGO_TARGET_ENV=${{ matrix.settings.target }} -v ${{ github.workspace }}/.github/docker-ubuntu-install.sh:/usr/local/docker-ubuntu-install.sh -v ${{ github.workspace }}/x-win-rs:/work -w /work
-          run: |
-            Xvfb :0 &
-            sleep 1
-            gpg-agent --daemon
-            sleep 1
-            xfce4-session &
-            sleep 1
-            sh /usr/local/docker-ubuntu-install.sh
+          run: sh /usr/local/docker-ubuntu-install.sh
 
       - name: Build
         run: cargo build --release --target ${{ matrix.settings.target }}