Merge commit '3d19b4993c' into main
This commit is contained in:
commit
dd43b1468b
14 changed files with 433 additions and 56 deletions
95
glfw/.github/workflows/ci.yml
vendored
Normal file
95
glfw/.github/workflows/ci.yml
vendored
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
name: CI
|
||||
on:
|
||||
- push
|
||||
- pull_request
|
||||
jobs:
|
||||
x86_64-linux:
|
||||
runs-on: ubuntu-latest
|
||||
# We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
|
||||
# to the branch.
|
||||
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
|
||||
env:
|
||||
DISPLAY: ':99.0'
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
sudo apt install xz-utils
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.9.0-dev.959+f011f1393.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: x86_64-linux -> x86_64-macos
|
||||
run: zig build test -Dtarget=x86_64-macos
|
||||
env:
|
||||
AGREE: true
|
||||
- name: x86_64-linux -> aarch64-macos
|
||||
run: zig build test -Dtarget=aarch64-macos
|
||||
env:
|
||||
AGREE: true
|
||||
- name: x86_64-linux -> x86_64-windows
|
||||
run: zig build test -Dtarget=x86_64-windows
|
||||
- name: launch xvfb
|
||||
run: Xvfb :99 -screen 0 1680x720x24 > /dev/null 2>&1 &
|
||||
- name: mach::test
|
||||
run: |
|
||||
sudo add-apt-repository -y ppa:kisak/kisak-mesa
|
||||
sudo apt-get update
|
||||
sudo apt-get install mesa-utils mesa-utils-extra mesa-va-drivers mesa-vdpau-drivers mesa-vulkan-drivers xvfb
|
||||
zig build test
|
||||
- name: webgpu::test
|
||||
run: cd webgpu && zig build test
|
||||
x86_64-windows:
|
||||
runs-on: windows-latest
|
||||
# We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
|
||||
# to the branch.
|
||||
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Install Git
|
||||
run: choco install git
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.9.0-dev.959+f011f1393.zip" -OutFile "C:\zig.zip"
|
||||
cd C:\
|
||||
7z x zig.zip
|
||||
Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.9.0-dev.959+f011f1393\"
|
||||
- name: x86_64-windows -> x86_64-macos
|
||||
run: zig build test -Dtarget=x86_64-macos
|
||||
env:
|
||||
AGREE: true
|
||||
- name: x86_64-windows -> aarch64-macos
|
||||
run: zig build test -Dtarget=aarch64-macos
|
||||
env:
|
||||
AGREE: true
|
||||
- name: x86_64-windows -> x86_64-linux
|
||||
run: zig build test -Dtarget=x86_64-linux
|
||||
- name: mach::test
|
||||
run: zig build test
|
||||
- name: webgpu::test
|
||||
run: cd webgpu && zig build test
|
||||
x86_64-macos:
|
||||
runs-on: macos-latest
|
||||
# We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
|
||||
# to the branch.
|
||||
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
brew install xz
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.9.0-dev.959+f011f1393.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: mach::test
|
||||
run: zig build test
|
||||
env:
|
||||
AGREE: true
|
||||
- name: x86_64-macos -> aarch64-macos
|
||||
run: zig build test -Dtarget=aarch64-macos
|
||||
env:
|
||||
AGREE: true
|
||||
- name: x86_64-macos -> x86_64-windows
|
||||
run: zig build test -Dtarget=x86_64-windows
|
||||
- name: x86_64-macos -> x86_64-linux
|
||||
run: zig build test -Dtarget=x86_64-linux
|
||||
- name: webgpu::test
|
||||
run: cd webgpu && zig build test
|
||||
35
glfw/.github/workflows/m1_ci.yml
vendored
Normal file
35
glfw/.github/workflows/m1_ci.yml
vendored
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
name: CI
|
||||
on:
|
||||
# SECURITY: This must be a push event only, otherwise our M1 mac runner would be compromised by
|
||||
# third-party pull requests which could run arbitrary code. This way, we can restrict it to
|
||||
# collaborators of the repository only.
|
||||
#
|
||||
# Whenever GitHub Actions gets official M1 support, we can use that for PRs and get rid of this
|
||||
# self-hosted runner: https://github.com/actions/virtual-environments/issues/2187
|
||||
- push
|
||||
jobs:
|
||||
aarch64-macos:
|
||||
runs-on: [self-hosted, macOS, ARM64]
|
||||
defaults:
|
||||
run:
|
||||
shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
zig version
|
||||
- name: mach::test
|
||||
run: zig build test
|
||||
env:
|
||||
AGREE: true
|
||||
- name: aarch64-macos -> x86_64-macos
|
||||
run: zig build test -Dtarget=x86_64-macos
|
||||
env:
|
||||
AGREE: true
|
||||
- name: aarch64-macos -> x86_64-windows
|
||||
run: zig build test -Dtarget=x86_64-windows
|
||||
- name: aarch64-macos -> x86_64-linux
|
||||
run: zig build test -Dtarget=x86_64-linux
|
||||
- name: webgpu::test
|
||||
run: cd webgpu && zig build test
|
||||
Loading…
Add table
Add a link
Reference in a new issue