Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a PR build workflow #78

Merged
merged 11 commits into from
Jun 4, 2024
Merged

Add a PR build workflow #78

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
60fd51f
Add a PR build workflow
zadjii-msft May 24, 2024
103cb5f
Oh I see, this is load bearing
zadjii-msft May 24, 2024
3d5be91
okay okay okay okay fine fine fine
zadjii-msft May 24, 2024
6ef5118
I think this is all the windows-2022 updates we need...
zadjii-msft May 29, 2024
0b2a9b7
it can't be this dumb, right?
zadjii-msft May 29, 2024
d112447
Okay, no it wasn't that dumb. Sanity check?
zadjii-msft May 29, 2024
a3129cc
this can't hurt, right?
zadjii-msft May 29, 2024
a0ad35e
um
zadjii-msft May 31, 2024
7654722
okay that's what i get for blind copypasta
zadjii Jun 1, 2024
bcd5008
I didn't realize the friendly paperclip wasn't installed by default
zadjii Jun 1, 2024
90fa0a4
another piece of dead code
zadjii Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/actions/fix-environment/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Fix environment
description: GitHub VMs aren't configured correctly
# Shamelessly borrowed from https://github.com/microsoft/windows-rs/blob/master/.github/actions/fix-environment/action.yml
runs:
using: "composite"
steps:
- name: Configure environment
shell: pwsh
run: |
switch -Wildcard ("${{ matrix.target }}")
{
"*-pc-windows-gnu"
{
"C:\msys64\mingw64\bin;C:\msys64\mingw32\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")
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
| 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
}
"aarch64*"
{
"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
}
}
5 changes: 4 additions & 1 deletion .github/workflows/pr-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
check:
runs-on: windows-2019
runs-on: windows-2022

strategy:
matrix:
Expand All @@ -35,6 +35,9 @@ jobs:
- name: Install fmt
run: rustup component add rustfmt

- name: Fix environment
uses: ./.github/actions/fix-environment

- name: Clean
run: cargo clean

Expand Down
Loading