-
-
Notifications
You must be signed in to change notification settings - Fork 435
ANGLE, SwiftShader, and Vulkan Loader prebuilts #746
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
c1f4d30
This pipeline _will_ fail, but want to see how far it will get
Perksey 979c864
Update build.sh
HurricanKai f1added
Remove workflow autogeneration, revert build script changes
Perksey 075ae45
Merge remote-tracking branch 'origin/feature/angle-swiftshader-prebui…
Perksey 6464b4e
Fix pipeline
Perksey d1a082f
Move temp folder
Perksey a54aded
Recursive checkout
Perksey 6308614
Recursive checkout except for one private Google submodule
Perksey ca5c4da
Update SwiftShader.yml
Perksey a283ebb
Ensure we checkout a branch maybe?
Perksey 636e998
Use checkout v2
Perksey cf72278
Install xcb
Perksey d5343d2
Sudo install xcb
Perksey cd3c88d
Setup .NET 6
Perksey b3caf99
Checkout with the right token
Perksey 93dc234
Don't do a parallelised run in CI - slaughters the runner
Perksey 9c584cc
Update SwiftShader.yml
Perksey f9afd2a
Add ANGLE
Perksey 76587a8
WHY
Perksey 2bf8e84
Make the damned thing executable
Perksey 5f81be9
No idea why we need PHP for Apache installed to build ANGLE but why not
Perksey 5c81491
Run as sudo for good measure
Perksey 267db17
Attempt to diagnose janky apt setup
Perksey 5e64696
Wtf is going on
Perksey 412df60
Use -X theirs instead of -s theirs which doesn't exist
Perksey 055f028
Ensure we're not affected by other [NUKE] changes harder
Perksey 9992d3f
Update ANGLE binaries (#749)
silkdotnet 5a5a533
You are the bane of my existence.
Perksey 9f29700
Merge remote-tracking branch 'origin/feature/angle-swiftshader-prebui…
Perksey 0585360
Allow overwrites
Perksey 9fb7fb2
Add Vulkan loader
Perksey 54e1bda
Add a workflow for Vulkan Loader
Perksey 9d70acd
cont'd
Perksey 5a154a8
I'm stupid
Perksey 58b704c
Install Wayland
Perksey 41be2d6
Install X11
Perksey cfb56c1
Pull... fkn race conditions man!
Perksey 419e27a
Update gitignore for good measure
Perksey 8a46fdb
Install different packages?
Perksey 85bd7e8
Glob the correct files, stop wasting Actions minutes unnecessarily
Perksey 79f432f
Update Vulkan Loader binaries (#763)
silkdotnet 6d739ee
No fail fast for SwiftShader
Perksey b75ebfb
No fail fast for ANGLE
Perksey 345b254
No fail fast for Vulkan Loader
Perksey f7ffd47
Remove workflow file in push paths on Vulkan Loader
Perksey 46577cd
Remove workflow file in push paths on SwiftShader
Perksey ff07b7b
Remove workflow file in push paths on ANGLE
Perksey c8b9468
New binaries for Vulkan Loader on Microsoft Windows 10.0.17763 (#764)
silkdotnet 0f127c6
Update SwiftShader binaries (#747)
silkdotnet dd5e324
Add packages for the new binaries
Perksey 855ca59
Adjust glob, let's figure out where it's actually putting these files...
Perksey 0c7a9eb
Actually glob the right paths
Perksey 9351498
cont'd
Perksey d404b80
cont'd 2
Perksey 4298a05
Update Vulkan Loader binaries (#765)
silkdotnet cc56d01
Update SwiftShader binaries (#766)
silkdotnet 822acff
Pull main
Perksey f6993da
Fix CI Build
Perksey 5eb27b8
Update Vulkan Loader binaries (#825)
silkdotnet 2ffc7bb
New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0:…
silkdotnet 8df41df
Update SwiftShader binaries (#826)
silkdotnet 708f018
Fix CI build harder
Perksey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
name: SwiftShader | ||
on: | ||
push: | ||
paths: | ||
- build/submodules/SwiftShader | ||
- build/nuke/Build.Native.cs | ||
branches-ignore: | ||
- "ci/*" | ||
- "develop/*" | ||
- "main" | ||
jobs: | ||
Build: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
env: | ||
- os: ubuntu-latest | ||
name: Linux | ||
nuke_invoke: ./build.sh | ||
extras: | | ||
sudo apt-get install -y libx11-xcb-dev | ||
- os: windows-latest | ||
name: Windows | ||
nuke_invoke: ./build.cmd | ||
extras: "" | ||
- os: macos-latest | ||
name: Darwin | ||
nuke_invoke: ./build.sh | ||
extras: "" | ||
name: ${{ matrix.env.name }} Build | ||
runs-on: ${{ matrix.env.os }} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} | ||
- name: Checkout submodules, configure git | ||
run: | | ||
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive | ||
git config --local user.email "9011267+dotnet-bot@users.noreply.github.com" | ||
git config --local user.name "The Silk.NET Automaton" | ||
- name: Extra prerequisites | ||
run: | | ||
echo running extras | ||
${{ matrix.env.extras }} | ||
- name: Cache .tmp, ~/.nuget/packages | ||
uses: actions/cache@v2 | ||
with: | ||
path: | | ||
.tmp | ||
~/.nuget/packages | ||
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} | ||
- name: Setup .NET 6.0 | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
dotnet-version: 6.0.100 | ||
- name: Build SwiftShader | ||
run: ${{ matrix.env.nuke_invoke }} SwiftShader | ||
env: | ||
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
name: ANGLE | ||
on: | ||
push: | ||
paths: | ||
- build/submodules/ANGLE | ||
- build/nuke/Build.Native.cs | ||
branches-ignore: | ||
- "ci/*" | ||
- "develop/*" | ||
- "main" | ||
jobs: | ||
Build: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
env: | ||
- os: ubuntu-latest | ||
name: Linux | ||
nuke_invoke: ./build.sh | ||
extras: | | ||
sudo apt-get remove php7.4-common | ||
sudo apt-get install -y libx11-xcb-dev libapache2-mod-php7.4 | ||
- os: windows-latest | ||
name: Windows | ||
nuke_invoke: ./build.cmd | ||
extras: "" | ||
- os: macos-latest | ||
name: Darwin | ||
nuke_invoke: ./build.sh | ||
extras: "" | ||
name: ${{ matrix.env.name }} Build | ||
runs-on: ${{ matrix.env.os }} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} | ||
- name: Checkout submodules, configure git | ||
run: | | ||
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive | ||
git config --local user.email "9011267+dotnet-bot@users.noreply.github.com" | ||
git config --local user.name "The Silk.NET Automaton" | ||
- name: Extra prerequisites | ||
run: | | ||
echo running extras | ||
${{ matrix.env.extras }} | ||
- name: Cache .tmp, ~/.nuget/packages | ||
uses: actions/cache@v2 | ||
with: | ||
path: | | ||
.tmp | ||
~/.nuget/packages | ||
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} | ||
- name: Setup .NET 6.0 | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
dotnet-version: 6.0.100 | ||
- name: Build ANGLE | ||
run: ${{ matrix.env.nuke_invoke }} Angle | ||
env: | ||
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
name: Vulkan Loader | ||
on: | ||
push: | ||
paths: | ||
- build/submodules/Vulkan-Loader | ||
- build/nuke/Build.Native.cs | ||
branches-ignore: | ||
- "ci/*" | ||
- "develop/*" | ||
- "main" | ||
jobs: | ||
Build: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
env: | ||
- os: ubuntu-latest | ||
name: Linux | ||
nuke_invoke: ./build.sh | ||
extras: | | ||
sudo apt-get install -y build-essential libx11-xcb-dev libxkbcommon-dev libwayland-dev libxrandr-dev | ||
- os: windows-latest | ||
name: Windows | ||
nuke_invoke: ./build.cmd | ||
extras: "" | ||
- os: macos-latest | ||
name: Darwin | ||
nuke_invoke: ./build.sh | ||
extras: "" | ||
name: ${{ matrix.env.name }} Build | ||
runs-on: ${{ matrix.env.os }} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} | ||
- name: Checkout submodules, configure git | ||
run: | | ||
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive | ||
git config --local user.email "9011267+dotnet-bot@users.noreply.github.com" | ||
git config --local user.name "The Silk.NET Automaton" | ||
- name: Extra prerequisites | ||
run: | | ||
echo running extras | ||
${{ matrix.env.extras }} | ||
- name: Cache .tmp, ~/.nuget/packages | ||
uses: actions/cache@v2 | ||
with: | ||
path: | | ||
.tmp | ||
~/.nuget/packages | ||
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} | ||
- name: Setup .NET 6.0 | ||
uses: actions/setup-dotnet@v1 | ||
with: | ||
dotnet-version: 6.0.100 | ||
- name: Build Vulkan Loader | ||
run: ${{ matrix.env.nuke_invoke }} VulkanLoader | ||
env: | ||
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,185 @@ | ||
{ | ||
"$schema": "http://json-schema.org/draft-04/schema#", | ||
"title": "Build Schema", | ||
"$ref": "#/definitions/build", | ||
"definitions": { | ||
"build": { | ||
"type": "object", | ||
"properties": { | ||
"Configuration": { | ||
"type": "string", | ||
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)" | ||
}, | ||
"Continue": { | ||
"type": "boolean", | ||
"description": "Indicates to continue a previously failed build attempt" | ||
}, | ||
"Help": { | ||
"type": "boolean", | ||
"description": "Shows the help text for this build assembly" | ||
}, | ||
"Host": { | ||
"type": "string", | ||
"description": "Host for execution. Default is 'automatic'", | ||
"enum": [ | ||
"AppVeyor", | ||
HurricanKai marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"AzurePipelines", | ||
"Bamboo", | ||
"Bitrise", | ||
"GitHubActions", | ||
"GitLab", | ||
"Jenkins", | ||
"Rider", | ||
"SpaceAutomation", | ||
"TeamCity", | ||
"Terminal", | ||
"TravisCI", | ||
"VisualStudio", | ||
"VSCode" | ||
] | ||
}, | ||
"MsbuildProperties": { | ||
"type": "array", | ||
"description": "Extra properties passed to MSBuild commands", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"Native": { | ||
"type": "boolean", | ||
"description": "Build native code" | ||
}, | ||
"NoLogo": { | ||
"type": "boolean", | ||
"description": "Disables displaying the NUKE logo" | ||
}, | ||
"NugetApiKey": { | ||
"type": "string", | ||
"description": "The API key used to push packages and symbols packages to NuGet" | ||
}, | ||
"NugetFeed": { | ||
"type": "string", | ||
"description": "NuGet feed" | ||
}, | ||
"NugetNoServiceEndpoint": { | ||
"type": "boolean", | ||
"description": "NuGet -NoServiceEndpoint" | ||
}, | ||
"NugetPassword": { | ||
"type": "string", | ||
"description": "NuGet password" | ||
}, | ||
"NugetUsername": { | ||
"type": "string", | ||
"description": "NuGet username" | ||
}, | ||
"OriginalSolution": { | ||
"type": "string", | ||
"description": "Path to a solution file that is automatically loaded" | ||
}, | ||
"Partition": { | ||
"type": "string", | ||
"description": "Partition to use on CI" | ||
}, | ||
"Plan": { | ||
"type": "boolean", | ||
"description": "Shows the execution plan (HTML)" | ||
}, | ||
"Profile": { | ||
"type": "array", | ||
"description": "Defines the profiles to load", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"Projects": { | ||
"type": "array", | ||
"description": "If specified, generates a solution including only the specified projects or group of projects. You can provide individual project names or the name of the folder in which they're contained e.g. \"--projects opengl examples/csharp vulkan microsoft core.win32extras silk.net.opencl\". The Silk.NET prefix for individual projects is optional, but folder names will be preferred over project names so if you only want \"Silk.NET.Vulkan\" and not everything in \"src/Vulkan\", use \"--projects silk.net.vulkan\". The solution include project dependencies. The solution will be regenerated whenever you run a NUKE build with this specified, but if you don't want to run a build just use \"nuke sln --projects ...\" to run a dummy target", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"Root": { | ||
"type": "string", | ||
"description": "Root directory during build execution" | ||
}, | ||
"SignPassword": { | ||
"type": "string", | ||
"description": "Code-signing service password" | ||
}, | ||
"SignUsername": { | ||
"type": "string", | ||
"description": "Code-signing service username" | ||
}, | ||
"Skip": { | ||
"type": "array", | ||
"description": "List of targets to be skipped. Empty list skips all dependencies", | ||
"items": { | ||
"type": "string", | ||
"enum": [ | ||
"Angle", | ||
"BuildLibSilkDroid", | ||
"Clean", | ||
"Compile", | ||
"FullCompile", | ||
"FullPack", | ||
"FullPushToNuGet", | ||
"Pack", | ||
"Prerequisites", | ||
"PushToNuGet", | ||
"RegenerateBindings", | ||
"Restore", | ||
"SignPackages", | ||
"Sln", | ||
"SwiftShader", | ||
"Test", | ||
"ValidateSolution", | ||
"VulkanLoader" | ||
] | ||
} | ||
}, | ||
"Sln": { | ||
"type": "boolean", | ||
"description": "If specified, when using the clean target removes the generated solution and stops" | ||
}, | ||
"Target": { | ||
"type": "array", | ||
"description": "List of targets to be invoked. Default is '{default_target}'", | ||
"items": { | ||
"type": "string", | ||
"enum": [ | ||
"Angle", | ||
"BuildLibSilkDroid", | ||
"Clean", | ||
"Compile", | ||
"FullCompile", | ||
"FullPack", | ||
"FullPushToNuGet", | ||
"Pack", | ||
"Prerequisites", | ||
"PushToNuGet", | ||
"RegenerateBindings", | ||
"Restore", | ||
"SignPackages", | ||
"Sln", | ||
"SwiftShader", | ||
"Test", | ||
"ValidateSolution", | ||
"VulkanLoader" | ||
] | ||
} | ||
}, | ||
"Verbosity": { | ||
"type": "string", | ||
"description": "Logging verbosity during build execution. Default is 'Normal'", | ||
"enum": [ | ||
"Minimal", | ||
"Normal", | ||
"Quiet", | ||
"Verbose" | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
{ | ||
"$schema": "./build.schema.json", | ||
"OriginalSolution": "Silk.NET.sln" | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.