From d67f230731b4d344da7935f9d3561451cbe3af67 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 10:36:28 +0100 Subject: [PATCH 01/20] ci: try to fix the tests on windows --- service/src/lib.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/service/src/lib.rs b/service/src/lib.rs index 8d3d6b9..24508d4 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -225,7 +225,7 @@ mod tests { wm protocol . WM_DELETE_WINDOW {destroy .}; "#, ); - thread::sleep(Duration::from_secs(1)); + input_field } @@ -236,11 +236,14 @@ mod tests { // To detect excessive backspace const LIMIT: &str = "bbb"; + // Start the sandbox + let textfield = start_sandbox(LIMIT); + // Start the afrim start_afrim(); - // Start the sandbox - let textfield = start_sandbox(LIMIT); + // We afrim to start + thread::sleep(Duration::from_secs(1)); rdev::simulate(&MouseMove { x: 100.0, y: 100.0 }).unwrap(); thread::sleep(typing_speed_ms); From a1347786e1a8b2463ce4f0ead0d6b442fa910e86 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:21:39 +0100 Subject: [PATCH 02/20] Update rust.yml --- .github/workflows/rust.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f87dad1..e6d5c05 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,7 +18,8 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + # os: [macos-latest, ubuntu-latest, windows-latest] + os: [windows-latest] include: - os: ubuntu-latest headless: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & @@ -35,6 +36,12 @@ jobs: packages: libxtst-dev libevdev-dev libxdo-dev version: 1.0 + - if: matrix.os == 'windows-latest' + run: | + wget https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 + wget -O https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 > tcl.msi + ./tcl.msi /quiet + - name: Add components run: rustup component add clippy rustfmt From 0a65cfaf5fc17d01ecec2c5d33a93d1aab96eb3c Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:26:10 +0100 Subject: [PATCH 03/20] Update rust.yml --- .github/workflows/rust.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e6d5c05..5305200 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,16 +30,15 @@ jobs: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 - - if: matrix.os == 'ubuntu-latest' - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: libxtst-dev libevdev-dev libxdo-dev - version: 1.0 + # - if: matrix.os == 'ubuntu-latest' + # uses: awalsh128/cache-apt-pkgs-action@latest + # with: + # packages: libxtst-dev libevdev-dev libxdo-dev + # version: 1.0 - if: matrix.os == 'windows-latest' run: | - wget https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 - wget -O https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 > tcl.msi + curl -o https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 > tcl.msi ./tcl.msi /quiet - name: Add components From 81546a856332d64575c05a9e2b6dfec1aa46c336 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:28:15 +0100 Subject: [PATCH 04/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5305200..fca125d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,7 +38,7 @@ jobs: - if: matrix.os == 'windows-latest' run: | - curl -o https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 > tcl.msi + curl "https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1" -o tcl.msi ./tcl.msi /quiet - name: Add components From ec5f9055b580f33623cf7ebff3c6763d3c04c8f1 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:35:58 +0100 Subject: [PATCH 05/20] Update rust.yml --- .github/workflows/rust.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fca125d..eaaa6f3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -20,11 +20,11 @@ jobs: matrix: # os: [macos-latest, ubuntu-latest, windows-latest] os: [windows-latest] - include: - - os: ubuntu-latest - headless: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - - os: macos-latest - extra: -- --skip test_simple + # include: + # - os: ubuntu-latest + # headless: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + # - os: macos-latest + # extra: -- --skip test_simple steps: - uses: actions/checkout@v3 @@ -39,7 +39,9 @@ jobs: - if: matrix.os == 'windows-latest' run: | curl "https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1" -o tcl.msi - ./tcl.msi /quiet + - if: matrix.os == 'windows-latest' + run: | + tcl.msi /quiet - name: Add components run: rustup component add clippy rustfmt From da308c4aab0db5042e5d037e780d4453427e4ebe Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:39:17 +0100 Subject: [PATCH 06/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index eaaa6f3..d084ffe 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -41,7 +41,7 @@ jobs: curl "https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1" -o tcl.msi - if: matrix.os == 'windows-latest' run: | - tcl.msi /quiet + .\tcl.msi /quiet - name: Add components run: rustup component add clippy rustfmt From 27b77e3313e81bc8db33a4088adcce87b4652ac9 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:47:25 +0100 Subject: [PATCH 07/20] Update rust.yml --- .github/workflows/rust.yml | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d084ffe..e672721 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,9 +27,6 @@ jobs: # extra: -- --skip test_simple steps: - - uses: actions/checkout@v3 - - uses: Swatinem/rust-cache@v2 - # - if: matrix.os == 'ubuntu-latest' # uses: awalsh128/cache-apt-pkgs-action@latest # with: @@ -38,33 +35,4 @@ jobs: - if: matrix.os == 'windows-latest' run: | - curl "https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1" -o tcl.msi - - if: matrix.os == 'windows-latest' - run: | - .\tcl.msi /quiet - - - name: Add components - run: rustup component add clippy rustfmt - - - name: Setup headless environment - run: ${{matrix.headless}} - - - name: Rustfmt - run: | - cargo fmt -- --check - - - name: Clippy - run: cargo clippy --all-targets --all-features -- -D warnings - - - name: Build - run: cargo build --all-features --verbose - - - name: Run tests (minimal) - run: cargo test --no-default-features --lib --bins --tests --verbose ${{matrix.extra}} - - - name: Run tests (normal) - run: cargo test --lib --bins --tests --verbose ${{matrix.extra}} - - - name: Run tests (full) - run: cargo test --all-features --lib --bins --tests --verbose ${{matrix.extra}} - + dir From 657d64c49fb713db24474d587a3018000988ee4d Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:49:46 +0100 Subject: [PATCH 08/20] Update rust.yml --- .github/workflows/rust.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e672721..1c029f3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,4 +35,6 @@ jobs: - if: matrix.os == 'windows-latest' run: | - dir + curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi + ./tcl.msi /quiet + dir.exe "C:\Program Files\" From 99e5ccc3201c42135ad370bb7e3446d7ca3a28d3 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 13:54:20 +0100 Subject: [PATCH 09/20] Update rust.yml --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1c029f3..dc82798 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,4 +37,5 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - dir.exe "C:\Program Files\" + dir.exe + dir.exe "env:ProgramFiles(x86)" From 8247197c10ce0f35accdc4870761f18173620898 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:02:35 +0100 Subject: [PATCH 10/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dc82798..4442d3f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,5 +37,5 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - dir.exe + dir.exe / dir.exe "env:ProgramFiles(x86)" From f5d11c2f99352e38af626b39b95c28c866654c6c Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:06:06 +0100 Subject: [PATCH 11/20] Update rust.yml --- .github/workflows/rust.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4442d3f..78e691a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,5 +37,4 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - dir.exe / - dir.exe "env:ProgramFiles(x86)" + tree.exe / From b66b8c033349570e30c27bc219701cd3face81f0 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:07:06 +0100 Subject: [PATCH 12/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 78e691a..4d54421 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,4 +37,4 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - tree.exe / + tree / From 91895f04152c4bb1c32ed7eb92e64a60c7bee7b3 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:09:04 +0100 Subject: [PATCH 13/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4d54421..d703874 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,4 +37,4 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - tree / + Show-Tree / From 1a8b55bdccee1f093ae26b669ff891a3fe4e785c Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:14:21 +0100 Subject: [PATCH 14/20] Update rust.yml --- .github/workflows/rust.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d703874..6f46167 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,4 +37,5 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - Show-Tree / + dir / + git-cmd tree / From a6158b6ee22729d89dea30a38e86135a04167a42 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:16:40 +0100 Subject: [PATCH 15/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6f46167..b5f0e65 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,5 +37,5 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - dir / + dir c:/ git-cmd tree / From 91a2e3defddf09cae9dc1630a0a55c2f2e764507 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:18:06 +0100 Subject: [PATCH 16/20] Update rust.yml --- .github/workflows/rust.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b5f0e65..bca92ce 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,5 +37,4 @@ jobs: run: | curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi ./tcl.msi /quiet - dir c:/ - git-cmd tree / + dir "c:/Program Files (x86)" From a1b4bf1552cdce9e5afe0516461c08ff7c138660 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:24:22 +0100 Subject: [PATCH 17/20] Update rust.yml --- .github/workflows/rust.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index bca92ce..49a9e76 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,6 +35,6 @@ jobs: - if: matrix.os == 'windows-latest' run: | - curl https://master.dl.sourceforge.net/project/magicsplat/magicsplat-tcl/tcl-8.6.8-installer-1.8.1-x86.msi?viasf=1 -o tcl.msi + curl "https://dl.activestate.com/camel-builds/ActiveTcl/MSWin32-x64/20230607T174924Z/ActiveTcl-8.6.13.0000-MSWin32-x64-559160e0.msi" -o tcl.msi ./tcl.msi /quiet - dir "c:/Program Files (x86)" + which wish From 2d68b97492805f48721666f8b1d4c14889f5b356 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:31:57 +0100 Subject: [PATCH 18/20] Update rust.yml --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 49a9e76..61c7e79 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,4 +37,5 @@ jobs: run: | curl "https://dl.activestate.com/camel-builds/ActiveTcl/MSWin32-x64/20230607T174924Z/ActiveTcl-8.6.13.0000-MSWin32-x64-559160e0.msi" -o tcl.msi ./tcl.msi /quiet + del /mingw64/bin/wish which wish From 87a25471425d8d6d3e3e3805c5e1b941a5721aed Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:32:56 +0100 Subject: [PATCH 19/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 61c7e79..1f09a54 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,5 +37,5 @@ jobs: run: | curl "https://dl.activestate.com/camel-builds/ActiveTcl/MSWin32-x64/20230607T174924Z/ActiveTcl-8.6.13.0000-MSWin32-x64-559160e0.msi" -o tcl.msi ./tcl.msi /quiet - del /mingw64/bin/wish + del c:/mingw64/bin/wish which wish From 44f2f5b334cae2464b464ccca691afab32daa722 Mon Sep 17 00:00:00 2001 From: Brady Fomegne Date: Sun, 3 Dec 2023 14:34:03 +0100 Subject: [PATCH 20/20] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1f09a54..d84b6f1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,5 +37,5 @@ jobs: run: | curl "https://dl.activestate.com/camel-builds/ActiveTcl/MSWin32-x64/20230607T174924Z/ActiveTcl-8.6.13.0000-MSWin32-x64-559160e0.msi" -o tcl.msi ./tcl.msi /quiet - del c:/mingw64/bin/wish + del "c:/Program Files (x86)/mingw64/bin/wish" which wish