From a0373f10985b2e7be19c4aea6929e034b917754a Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sun, 18 Feb 2024 21:52:59 -0800 Subject: [PATCH] Replace install actions with choco install commands --- .github/workflows/build-rust.yml | 15 +++------------ .github/workflows/build.yml | 8 +++----- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-rust.yml b/.github/workflows/build-rust.yml index abcde71e..8621a569 100644 --- a/.github/workflows/build-rust.yml +++ b/.github/workflows/build-rust.yml @@ -53,24 +53,15 @@ jobs: - name: Set up MinGW if: matrix.os == 'windows-2022' && matrix.optimizer_backend == 'casadi' - uses: egor-tensin/setup-mingw@v2 - with: - platform: x64 - version: 11.2.0 - static: 0 + run: | + choco upgrade mingw --version=11.2.0 -y --no-progress --allow-downgrade + echo C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin >> $env:GITHUB_PATH - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: targets: ${{matrix.rust-target}} - - name: Set up Clang - if: ${{ !startsWith(matrix.os, 'macOS') }} - uses: egor-tensin/setup-clang@v1 - with: - version: latest - platform: x64 - - name: Build Rust working-directory: rust run: cargo build --target ${{ matrix.rust-target }} --features ${{ matrix.optimizer_backend }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 547318a8..483c5647 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,11 +56,9 @@ jobs: - name: Set up MinGW if: matrix.os == 'windows-2022' && matrix.optimizer_backend == 'casadi' - uses: egor-tensin/setup-mingw@v2 - with: - platform: x64 - version: 11.2.0 - static: 0 + run: | + choco upgrade mingw --version=11.2.0 -y --no-progress --allow-downgrade + echo C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin >> $env:GITHUB_PATH - name: configure run: cmake -B build -S . ${{ matrix.cmake-flags }} -DOPTIMIZER_BACKEND=${{ matrix.optimizer_backend }} -DWITH_JAVA=ON -DJAVA_INSTALL_JAR=OFF