From bdbeb2d02516fce632e1bf0a8de9cfb41fd651db Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:13:45 +0200 Subject: [PATCH 1/8] Update main.yml --- .github/workflows/main.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3517101..361527e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,6 +42,14 @@ jobs: - run: apt-get install gcc-mingw-w64 libx11-xcb-dev curl wget build-essential git musl-tools -y continue-on-error: true + - uses: hecrj/setup-rust-action@v2 + with: + rust-version: stable + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.29.3' + # install choosenim and nim #- run: wget https://nim-lang.org/choosenim/init.sh -O init-choosenim.sh #- run: ls -la @@ -110,6 +118,13 @@ jobs: steps: - name: Checkout the repo uses: actions/checkout@v4.1.7 + + - uses: hecrj/setup-rust-action@v2 + with: + rust-version: stable + + - run: winget install Kitware.CMake + - uses: iffy/install-nim@v5 with: version: binary:2.0.6 From 8909f0d04dbcadde5434303458ebe120ebf205d3 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:19:53 +0200 Subject: [PATCH 2/8] Update main.yml --- .github/workflows/main.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 361527e4..64dd014d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,6 +42,8 @@ jobs: - run: apt-get install gcc-mingw-w64 libx11-xcb-dev curl wget build-essential git musl-tools -y continue-on-error: true + - run: export PATH="/github/home/.cargo/bin" + - uses: hecrj/setup-rust-action@v2 with: rust-version: stable @@ -119,12 +121,15 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4.1.7 + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.29.3' + - uses: hecrj/setup-rust-action@v2 with: rust-version: stable - - run: winget install Kitware.CMake - - uses: iffy/install-nim@v5 with: version: binary:2.0.6 From 2fc36046d741298795e19ae7de40feb70c8b9417 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:24:16 +0200 Subject: [PATCH 3/8] Update main.yml --- .github/workflows/main.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64dd014d..2406bedb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,11 +42,13 @@ jobs: - run: apt-get install gcc-mingw-w64 libx11-xcb-dev curl wget build-essential git musl-tools -y continue-on-error: true - - run: export PATH="/github/home/.cargo/bin" - - uses: hecrj/setup-rust-action@v2 + - name: Install latest nightly + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: stable + toolchain: stable + override: true + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: @@ -126,9 +128,14 @@ jobs: with: cmake-version: '3.29.3' - - uses: hecrj/setup-rust-action@v2 + #- uses: hecrj/setup-rust-action@v2 + # with: + # rust-version: stable + - name: Install latest nightly + uses: actions-rs/toolchain@v1.0.6 with: - rust-version: stable + toolchain: stable + override: true - uses: iffy/install-nim@v5 with: From bc34c7f244c36a2f945caf864e1266a4bb7d261d Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:33:23 +0200 Subject: [PATCH 4/8] Update main.yml --- .github/workflows/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2406bedb..3d0b5f7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,12 +42,8 @@ jobs: - run: apt-get install gcc-mingw-w64 libx11-xcb-dev curl wget build-essential git musl-tools -y continue-on-error: true - - - name: Install latest nightly - uses: actions-rs/toolchain@v1.0.6 - with: - toolchain: stable - override: true + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@1.70 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 1316b8c2319bb824ae345ee320245ff308149e62 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:36:01 +0200 Subject: [PATCH 5/8] Update main.yml --- .github/workflows/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d0b5f7b..fba466f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,6 +119,13 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4.1.7 + - run: cargo --help + continue-on-error: true + - run: cmake --help + continue-on-error: true + + - run: SET TMP=C:\Temp + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: @@ -133,6 +140,11 @@ jobs: toolchain: stable override: true + - run: cargo --help + continue-on-error: true + - run: cmake --help + continue-on-error: true + - uses: iffy/install-nim@v5 with: version: binary:2.0.6 From 27a6863e63f1fe49988e0b9743729dfae3fa6e44 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:40:43 +0200 Subject: [PATCH 6/8] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fba466f6..e4fec119 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,8 +42,8 @@ jobs: - run: apt-get install gcc-mingw-w64 libx11-xcb-dev curl wget build-essential git musl-tools -y continue-on-error: true - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@1.70 + - name: Install stable rust toolchain + uses: dtolnay/rust-toolchain@1.78 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 73418a970159561078999965fe8a027a0efd6e57 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 22:52:44 +0200 Subject: [PATCH 7/8] Update main.yml --- .github/workflows/main.yml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4fec119..a2b5b277 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,13 +119,11 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4.1.7 - - run: cargo --help + - run: rustc --version continue-on-error: true - - run: cmake --help + - run: cmake --version continue-on-error: true - - run: SET TMP=C:\Temp - - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: @@ -140,9 +138,25 @@ jobs: toolchain: stable override: true - - run: cargo --help + - run: rustc --version + continue-on-error: true + - run: cmake --version + continue-on-error: true + + - run: SET TMP=C:\Temp + continue-on-error: true + - run: SET TEMP=C:\Temp + continue-on-error: true + - run: echo %TMP% + continue-on-error: true + - run: echo %TEMP% + continue-on-error: true + + - run: $env:TMP = "C:\Temp" + continue-on-error: true + - run: $env:TEMP = "C:\Temp" continue-on-error: true - - run: cmake --help + - run: echo $env:TMP $env:TEMP continue-on-error: true - uses: iffy/install-nim@v5 From ab0dd63b2d93bd0935a8f51d6c213caa2ec20038 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 16 Jul 2024 23:02:10 +0200 Subject: [PATCH 8/8] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2b5b277..113a1334 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -152,9 +152,9 @@ jobs: - run: echo %TEMP% continue-on-error: true - - run: $env:TMP = "C:\Temp" + - run: $env:TMP = "$env:USERPROFILE\T" continue-on-error: true - - run: $env:TEMP = "C:\Temp" + - run: $env:TEMP = "$env:USERPROFILE\T" continue-on-error: true - run: echo $env:TMP $env:TEMP continue-on-error: true