Ci revamp retry docker (#5)

Author: En-En-Code

.github/workflows/ci.yml

@@ -3,77 +3,85 @@ name: CI
 on:
   push:
     branches: [ "main", "ci-revamp-test" ]
+    tags: [ '*' ]
+    paths-ignore: [ '*.md' ]
   pull_request:
     branches: [ "main", "ci-revamp-test" ]
 
 env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
   UBUNTU_DOCKERFILE: .github/workflows/ubuntu.dockerfile
 
 permissions:
+  pull-requests: read
   contents: read
   packages: read
 
 jobs:
-  build:
+  set-vars:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 2
+          sparse-checkout: |
+            .github
+            Cargo.toml
+          sparse-checkout-cone-mode: false
+      - id: set-vars
+        run: ./.github/workflows/set-vars.sh ${GITHUB_REPOSITORY@L}
+    outputs:
+      msrv: ${{ steps.set-vars.outputs.msrv }}
+      should-build: ${{ steps.set-vars.outputs.should_build == 'true' && github.event_name == 'push' }}
+      container-path: ${{ steps.set-vars.outputs.container_path }}
+
+  container-build:
+    runs-on: ubuntu-latest
+    needs: set-vars
+    if: ${{ needs.set-vars.outputs.should-build == 'true' }}
     permissions:
-      contents: read
       packages: write
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          sparse-checkout: Cargo.toml
-      - name: Get commit timestamp
-        run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> "$GITHUB_ENV"
-      - name: Get MSRV
-        run: echo "MSRV=$(
-          awk '/^rust-version = "[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+"$/ {
-            print substr($NF, 2, length($NF) - 2)
-          }' Cargo.toml)" >> "$GITHUB_ENV"
-      - id: image-name
-        run: |
-          echo "name=${{ env.REGISTRY }}/${GITHUB_REPOSITORY@L}-ubuntu" >> "$GITHUB_OUTPUT"
+      - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v6
-        id: docker-build-push-registry
         with:
           file: ${{ env.UBUNTU_DOCKERFILE }}
-          tags: ${{ steps.image-name.outputs.name }}:latest
+          push: true
+          tags: ${{ needs.set-vars.outputs.container-path }}-ubuntu:latest
           labels: org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
-          cache-from: type=registry,ref=${{ steps.image-name.outputs.name }}:cache
-          cache-to: |
-            ${{ github.event_name == 'push' &&
-            format('type=registry,ref={0}:cache,mode=max', steps.image-name.outputs.name) ||
-            '' }}
-          outputs: |
-            type=image,ref=${{ steps.image-name.outputs.name }}:latest,push=${{ github.event_name == 'push' }}
-      - name: ctr images list
-        run: sudo ctr images list
-      - name: Start container
-        run: docker run --name xwls-test --detach --interactive --tty
-          ${{ steps.image-name.outputs.name }}:latest
-      - name: Check workspace
-        run: docker exec --interactive xwls-test
-          sh -c "cargo check --profile ci --locked --verbose --keep-going --workspace --exclude xwayland-satellite"
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  xwls-build-test:
+    needs: [container-build, set-vars]
+    if: ${{ always() && (needs.container-build.result == 'success' || needs.container-build.result == 'skipped') }}
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ needs.set-vars.outputs.container-path }}-ubuntu:latest
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v5
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ needs.set-vars.outputs.msrv }}
+          components: clippy, rustfmt
       - name: Build
-        run: docker exec --interactive xwls-test
-          sh -c "cargo test --no-run --profile ci --locked --verbose"
+        run: cargo build --all-targets --profile ci --locked --verbose
       - name: Run tests
-        run: docker exec --interactive xwls-test
-          sh -c "cargo test --profile ci --locked --verbose --no-fail-fast -- --test-threads 1"
+        run: cargo test --profile ci --locked --verbose -- --test-threads 1 --nocapture
       - name: Format check
-        run: docker exec --interactive xwls-test
-          sh -c "cargo fmt --check"
+        run: cargo fmt --check
       - name: Clippy
-        run: docker exec --interactive xwls-test
-          sh -c "cargo clippy --profile ci --locked --workspace --all-targets"
+        run: cargo clippy --all-targets --profile ci --locked --workspace

.github/workflows/set-vars.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+msrv=$(
+    awk '/^rust-version = "[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+"$/ {
+      print substr($NF, 2, length($NF) - 2)
+    }' Cargo.toml
+)
+if [ -z $msrv ]; then
+    printf "Could not determine Rust toolchain version\n"
+    exit 1
+fi
+
+if ! $(git diff HEAD~1 --quiet -- "$UBUNTU_DOCKERFILE") ||
+    $(git describe --candidates=0); then
+    should_build=true
+else
+    should_build=false
+fi
+
+echo "msrv=$msrv" >> "$GITHUB_OUTPUT"
+echo "should_build=$should_build" >> "$GITHUB_OUTPUT"
+echo "container_path=$REGISTRY/$1" >> "$GITHUB_OUTPUT"

.github/workflows/ubuntu.dockerfile

@@ -1,17 +1,9 @@
-FROM ubuntu:24.04
+FROM ubuntu:latest
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
-ENV CARGO_HOME=/cargo RUSTUP_HOME=/rustup
 RUN apt-get update \
-	&& apt-get install -y xwayland libxcb1 clang libxcb-cursor0 libxcb-cursor-dev curl pkg-config libegl1 \
+	&& apt-get install -y xwayland libxcb1 clang libxcb-cursor0 libxcb-cursor-dev pkg-config libegl1 \
 	&& rm -r /var/lib/apt/lists/*
-ENV MSRV=1.83.0
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-	&& . "/cargo/env" \
-	&& rustup toolchain install $MSRV \
-	&& rustup default $MSRV
 RUN mkdir /run/xwls-test
-ENV PATH="/cargo/bin:$PATH" XDG_RUNTIME_DIR="/run/xwls-test"
-COPY . /xwls
-WORKDIR /xwls
+ENV XDG_RUNTIME_DIR="/run/xwls-test"

Cargo.toml

@@ -12,7 +12,7 @@ rustix = "0.38.31"
 all = "deny"
 
 [workspace.package]
-rust-version = "1.83.0"
+rust-version = "1.87.0"
 
 [package]
 name = "xwayland-satellite"

tests/integration.rs

@@ -131,7 +131,7 @@ impl Fixture {
         // wait for connection
         let fd = unsafe { BorrowedFd::borrow_raw(testwl.poll_fd().as_raw_fd()) };
         let pollfd = PollFd::from_borrowed_fd(fd, PollFlags::IN);
-        assert!(poll(&mut [pollfd.clone()], 100).unwrap() > 0);
+        assert!(poll(&mut [pollfd.clone()], -1).unwrap() > 0);
         testwl.dispatch();
 
         let try_bool_timeout = |b: &AtomicBool| {

testwl/src/lib.rs

@@ -1,6 +1,6 @@
 use std::collections::{hash_map, HashMap, HashSet};
 use std::io::Read;
-use std::io::Write;
+use std::io::{PipeWriter, Write};
 use std::os::fd::{AsFd, BorrowedFd, OwnedFd};
 use std::os::unix::net::UnixStream;
 use std::sync::{Arc, Mutex, OnceLock};
@@ -1026,7 +1026,7 @@ impl Dispatch<WlDataOffer, Vec<PasteData>> for State {
                     .position(|data| data.mime_type == mime_type)
                     .unwrap_or_else(|| panic!("Invalid mime type: {mime_type}"));
 
-                let mut stream = UnixStream::from(fd);
+                let mut stream = PipeWriter::from(fd);
                 stream.write_all(&data[pos].data).unwrap();
             }
             wl_data_offer::Request::Destroy => {}