From 83065369d966cfa61f424eb9a3c8e73804f7a1fc Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Tue, 9 Apr 2024 08:23:19 -0500 Subject: [PATCH] remove action --- .github/actions/fix-environment/action.yml | 50 ---------------------- .github/workflows/lib.yml | 3 -- .github/workflows/raw_dylib.yml | 3 -- .github/workflows/test.yml | 2 - 4 files changed, 58 deletions(-) delete mode 100644 .github/actions/fix-environment/action.yml diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml deleted file mode 100644 index 895fb861f8..0000000000 --- a/.github/actions/fix-environment/action.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Fix environment -description: GitHub VMs aren't configured correctly -runs: - using: "composite" - steps: - - name: Configure Cargo for GNU - shell: pwsh - run: | - Add-Content $env:USERPROFILE\.cargo\config @" - [target.x86_64-pc-windows-gnu] - linker = `"C:\\msys64\\mingw64\\bin\\x86_64-w64-mingw32-gcc.exe`" - ar = `"C:\\msys64\\mingw64\\bin\\ar.exe`" - [target.i686-pc-windows-gnu] - linker = `"C:\\msys64\\mingw32\\bin\\i686-w64-mingw32-gcc.exe`" - ar = `"C:\\msys64\\mingw32\\bin\\ar.exe`" - "@ - if: contains(matrix.target, 'windows-gnu') - - name: Configure environment - shell: pwsh - run: | - switch -Wildcard ("${{ matrix.target }}") - { - "i686-pc-windows-gnu" - { - "C:\msys64\mingw32\bin" >> $env:GITHUB_PATH - } - "x86_64-pc-windows-gnu" - { - "C:\msys64\mingw64\bin" >> $env:GITHUB_PATH - } - "i686*" - { - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86" >> $env:GITHUB_PATH - ((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx86\x86") - | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH - } - "x86_64*" - { - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH - ((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx64\x64") - | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH - } - "*" - { - (Join-Path $env:GITHUB_WORKSPACE "target\debug\deps").ToString() >> $env:GITHUB_PATH - (Join-Path $env:GITHUB_WORKSPACE "target\test\debug\deps").ToString() >> $env:GITHUB_PATH - "INCLUDE=C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\cppwinrt" ` - >> $env:GITHUB_ENV - } - } \ No newline at end of file diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml index c81288c01b..1a0417f5cd 100644 --- a/.github/workflows/lib.yml +++ b/.github/workflows/lib.yml @@ -19,9 +19,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Fix environment - uses: ./.github/actions/fix-environment - - name: Build gnu libs shell: cmd run: | diff --git a/.github/workflows/raw_dylib.yml b/.github/workflows/raw_dylib.yml index 9782edd88a..6d2bc98dfc 100644 --- a/.github/workflows/raw_dylib.yml +++ b/.github/workflows/raw_dylib.yml @@ -32,9 +32,6 @@ jobs: - name: Add toolchain target run: rustup target add ${{ matrix.target }} - - - name: Fix environment - uses: ./.github/actions/fix-environment - name: Test run: > diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb839f5da3..1927cfadda 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,8 +37,6 @@ jobs: run: rustup target add ${{ matrix.target }} - name: Install fmt run: rustup component add rustfmt - - name: Fix environment - uses: ./.github/actions/fix-environment - name: Test run: > cargo test -p riddle &&