all: move standalone libraries to libs/ subdirectory
The root dir of our repository has grown quite a lot the past few months.
I'd like to make it more clear where the bulk of the engine lives (`src/`) and
also make it more clear which Mach libraries are consumable as standalone projects.
As for the name of this directory, `libs` was my first choice but there's a bit of
a convention of that being external libraries in Zig projects _today_, while these
are libraries maintained as part of Mach in this repository - not external ones.
We will name this directory `libs`, and if we have a need for external libraries
we will use `external` or `deps` for that directory name. I considered other names
such as `components`, `systems`, `modules` (which are bad as they overlap with
major ECS / engine concepts), and it seems likely the official Zig package manager
will break the convention of using a `libs` dir anyway.
Performed via:
```sh
mkdir libs/
git mv freetype libs/
git mv basisu libs/
git mv gamemode libs/
git mv glfw libs/
git mv gpu libs/
git mv gpu-dawn libs/
git mv sysaudio libs/
git mv sysjs libs/
git mv ecs libs/
```
git-subtree-dir: glfw
git-subtree-mainline: 0d5b853443
git-subtree-split: 572d1144f11b353abdb64fff828b25a4f0fbb7ca
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
git mv ecs libs/
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
parent
79ec61396f
commit
0645429df9
240 changed files with 6 additions and 6 deletions
1
libs/gpu-dawn/.github/FUNDING.yml
vendored
Normal file
1
libs/gpu-dawn/.github/FUNDING.yml
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
github: slimsag
|
||||
5
libs/gpu-dawn/.github/pull_request_template.md
vendored
Normal file
5
libs/gpu-dawn/.github/pull_request_template.md
vendored
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/gpu-dawn) instead, sorry for the trouble!
|
||||
|
||||
This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync.
|
||||
|
||||
Once your PR is merged over there, it'll automatically sync to this repository.
|
||||
195
libs/gpu-dawn/.github/workflows/ci.yml
vendored
Normal file
195
libs/gpu-dawn/.github/workflows/ci.yml
vendored
Normal file
|
|
@ -0,0 +1,195 @@
|
|||
name: CI
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: ["Draft release"]
|
||||
types:
|
||||
- completed
|
||||
jobs:
|
||||
x86_64-linux-gnu_debug:
|
||||
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.workflow_run.conclusion == 'success' && (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: |
|
||||
sudo apt install xz-utils
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (debug)
|
||||
run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-linux-gnu
|
||||
- name: upload (debug)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: x86_64-linux-gnu_debug
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-linux-gnu_release-fast:
|
||||
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.workflow_run.conclusion == 'success' && (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: |
|
||||
sudo apt install xz-utils
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (release-fast)
|
||||
run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-linux-gnu
|
||||
- name: upload (release-fast)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: x86_64-linux-gnu_release-fast
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-linux-musl_debug:
|
||||
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.workflow_run.conclusion == 'success' && (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: |
|
||||
sudo apt install xz-utils
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (debug)
|
||||
run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-linux-musl
|
||||
- name: upload (debug)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: x86_64-linux-musl_debug
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-linux-musl_release-fast:
|
||||
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.workflow_run.conclusion == 'success' && (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: |
|
||||
sudo apt install xz-utils
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (release-fast)
|
||||
run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-linux-musl
|
||||
- name: upload (release-fast)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: x86_64-linux-musl_release-fast
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-windows-gnu_debug:
|
||||
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.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install Git
|
||||
run: choco install git
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
$ProgressPreference = 'SilentlyContinue'
|
||||
Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip"
|
||||
cd C:\
|
||||
7z x zig.zip
|
||||
Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\"
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (debug)
|
||||
run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-windows-gnu
|
||||
- name: upload (debug)
|
||||
run: ./dev/upload-release.sh
|
||||
shell: bash
|
||||
env:
|
||||
WINDOWS: true
|
||||
RELEASE_NAME: x86_64-windows-gnu_debug
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-windows-gnu_release-fast:
|
||||
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.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install Git
|
||||
run: choco install git
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
$ProgressPreference = 'SilentlyContinue'
|
||||
Invoke-WebRequest -Uri "https://ziglang.org/builds/zig-windows-x86_64-0.10.0-dev.3551+92568a009.zip" -OutFile "C:\zig.zip"
|
||||
cd C:\
|
||||
7z x zig.zip
|
||||
Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.3551+92568a009\"
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (release-fast)
|
||||
run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-windows-gnu -Drelease-fast=true
|
||||
- name: upload (release-fast)
|
||||
run: ./dev/upload-release.sh
|
||||
shell: bash
|
||||
env:
|
||||
WINDOWS: true
|
||||
RELEASE_NAME: x86_64-windows-gnu_release-fast
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-macos_debug:
|
||||
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.workflow_run.conclusion == 'success' && (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 uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066
|
||||
brew install xz
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (debug)
|
||||
run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-macos.12-none
|
||||
env:
|
||||
AGREE: true
|
||||
- name: upload (debug)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: x86_64-macos-none_debug
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
x86_64-macos_release-fast:
|
||||
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.workflow_run.conclusion == 'success' && (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 uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066
|
||||
brew install xz
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-x86_64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (release-fast)
|
||||
run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-macos.12-none
|
||||
env:
|
||||
AGREE: true
|
||||
- name: upload (release-fast)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: x86_64-macos-none_release-fast
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
16
libs/gpu-dawn/.github/workflows/draft_release.yml
vendored
Normal file
16
libs/gpu-dawn/.github/workflows/draft_release.yml
vendored
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
name: Draft release
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'main'
|
||||
jobs:
|
||||
draft:
|
||||
if: ${{ !contains(github.event.head_commit.message, 'update to latest binary release') }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Create draft
|
||||
run: gh release create "release-$(git rev-parse --short HEAD)" --title "Automatic release of main @ $(git rev-parse --short HEAD)"
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
45
libs/gpu-dawn/.github/workflows/m1_ci.yml
vendored
Normal file
45
libs/gpu-dawn/.github/workflows/m1_ci.yml
vendored
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
name: M1
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: ["Draft release"]
|
||||
types:
|
||||
- completed
|
||||
jobs:
|
||||
aarch64-macos:
|
||||
if: ${{ github.repository == 'hexops/mach-gpu-dawn' && github.event.workflow_run.conclusion == 'success' }}
|
||||
runs-on: [self-hosted, macOS, ARM64]
|
||||
defaults:
|
||||
run:
|
||||
shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}"
|
||||
steps:
|
||||
- name: Clean repository submodules
|
||||
# See https://github.com/actions/checkout/issues/385
|
||||
run: |
|
||||
rm -rf $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Setup Zig
|
||||
run: |
|
||||
sudo rm -rf /usr/local/bin/zig /usr/local/bin/lib/
|
||||
sudo sh -c 'wget -c https://ziglang.org/builds/zig-macos-aarch64-0.10.0-dev.3551+92568a009.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
|
||||
- name: Clone mach-glfw
|
||||
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
|
||||
- name: install (debug)
|
||||
run: zig build install -Ddawn-from-source=true -Dtarget=aarch64-macos.12-none
|
||||
env:
|
||||
AGREE: true
|
||||
- name: upload (debug)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: aarch64-macos-none_debug
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: install (release-fast)
|
||||
run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=aarch64-macos.12-none
|
||||
env:
|
||||
AGREE: true
|
||||
- name: upload (release-fast)
|
||||
run: ./dev/upload-release.sh
|
||||
env:
|
||||
RELEASE_NAME: aarch64-macos-none_release-fast
|
||||
UPLOAD_HEADERS: true
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
45
libs/gpu-dawn/.github/workflows/publish_release.yml
vendored
Normal file
45
libs/gpu-dawn/.github/workflows/publish_release.yml
vendored
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
name: Publish release
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: ["CI"]
|
||||
types:
|
||||
- completed
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
publish:
|
||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Record latest release version
|
||||
id: recorded_release_version
|
||||
# Note: we find the latest non-'update to latest binary release' commit here, which is not
|
||||
# necessarily HEAD because another build could have succeeded before us and HEAD may now refer
|
||||
# to 'update to latest binary release' instead of the commit we were building.
|
||||
# By doing this, we ensure any update we push would refer to the absolute latest binary
|
||||
# release even if *this* CI run is older.
|
||||
run: echo "::set-output name=commit::$(git log --oneline | grep -v 'update to latest binary release' | head -n1 | cut -d " " -f1)"
|
||||
# - name: Publish release
|
||||
# run: echo "TODO(build-system): gh CLI has no way to mark draft as published?"
|
||||
# env:
|
||||
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Checkout hexops/mach monorepo
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
repository: hexops/mach
|
||||
token: ${{ secrets.HEXOPS_MACH_GPU_DAWN_PUSH }}
|
||||
- name: 'gpu/dawn: update hard-coded binary release version'
|
||||
env:
|
||||
RELEASE_COMMIT: ${{steps.recorded_release_version.outputs.commit}}
|
||||
run: |
|
||||
sed -i "/binary_version: \[\]const u8 =/c\ binary_version: []const u8 = \"release-$RELEASE_COMMIT\"," ./gpu-dawn/build.zig
|
||||
- name: 'gpu/dawn: use latest binary release'
|
||||
run: |
|
||||
git config user.name 'Release automation'
|
||||
git config user.email 'stephen@hexops.com'
|
||||
git add .
|
||||
git commit -m 'gpu-dawn: update to latest binary release'
|
||||
git push -u origin HEAD
|
||||
Loading…
Add table
Add a link
Reference in a new issue