Simplify Github Actions workflow
- Removed GN builds because they seem thoroughly exercised on gerrit.
- Removed ninja action dependency because ninja is already available
in macos and manylinux_2_28.
- Enabled debug windows builds through the use of VS generator. It
seems to avoid the PDB locking issue from SPIRV-Tools-static.
- Since VS generator is used, cmake is able to load up VS dev env, so
no need for another action dependency to do that.
- Use `manylinux_2_28-x64` container on ubuntu for ABI compatibility
with glibc 2.28.
Creating PR on github to debug GA runs.
This is an imported pull request from
https://github.com/google/dawn/pull/19
GITHUB_PR_HEAD_SHA=2a454f1b67eb974e0ae0dcca1348785a8715c992
ORIGINAL_AUTHOR=Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
GitOrigin-RevId: d9c51ebe5f3d80033022aa630eaff2b2ceb2a317
Change-Id: Ib0e11fce5a144a320643513bd90f071480d42d24
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/196935
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1d346f..c845150 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,159 +13,104 @@
cancel-in-progress: true
jobs:
- gn:
- strategy:
- # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
- fail-fast: false
-
- matrix:
- os: [ubuntu-latest, windows-latest, macos-latest]
-
- name: GN ${{ matrix.os }}
- runs-on: ${{ matrix.os }}
-
- steps:
- - name: Install Ubuntu build dependencies
- if: matrix.os == 'ubuntu-latest'
- run: |
- sudo apt update
- sudo apt install libgl-dev libx11-xcb-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev wayland-protocols libwayland-dev libxkbcommon-dev
-
- - name: Install depot_tools
- uses: newkdev/setup-depot-tools@v1.0.1
-
- - uses: actions/checkout@v3
-
- - name: Set reusable strings
- # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
- id: strings
- shell: bash
- run: |
- echo "build-output-dir=out/build" >> "$GITHUB_OUTPUT"
-
- - name: Set up checkout
- run: |
- cp ./scripts/standalone.gclient .gclient
-
- - name: gclient sync --no-history --shallow
- run: gclient sync --no-history --shallow
- env:
- DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-
- - name: Set up sccache
- uses: mozilla-actions/sccache-action@v0.0.3
-
- - name: Generate build files
- shell: bash
- run: |
- mkdir -p ${{ steps.strings.outputs.build-output-dir }}
- cat << EOF >> ${{ steps.strings.outputs.build-output-dir }}/args.gn
- cc_wrapper="sccache"
- is_debug=false
- is_component_build=true
- is_clang=true
- EOF
- gn gen ${{ steps.strings.outputs.build-output-dir }}
-
- env:
- SCCACHE_GHA_ENABLED: "true"
- DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-
- - name: Build
- run: autoninja -C ${{ steps.strings.outputs.build-output-dir }}
- env:
- SCCACHE_GHA_ENABLED: "true"
- DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-
cmake:
strategy:
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
fail-fast: false
+ # Set up a matrix to run the following 6 configurations:
+ # 1. <Windows, Debug, latest MSVC compiler toolchain on the default runner image, default generator>
+ # 2. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
+ # 3. <Linux, Debug, latest GCC compiler toolchain in the container, default generator>
+ # 4. <Linux, Release, latest GCC compiler toolchain in the container, default generator>
+ # 5. <MacOS, Debug, latest Clang compiler toolchain on the default runner image, default generator>
+ # 6. <MacOS, Release, latest Clang compiler toolchain on the default runner image, default generator>
matrix:
- os: [ubuntu-latest, windows-latest, macos-latest]
+ os: [macos-latest, ubuntu-latest, windows-latest]
build_type: [Debug, Release]
- c_compiler: [clang, cl]
+ toolchain: [gcc, clang, msvc]
include:
+ - os: macos-latest
+ toolchain: clang
+ c_compiler: $(brew --prefix llvm@15)/bin/clang
+ cpp_compiler: $(brew --prefix llvm@15)/bin/clang++
+ env:
+ MACOSX_DEPLOYMENT_TARGET: "11.0"
+ container: null
- os: windows-latest
+ toolchain: msvc
c_compiler: cl
cpp_compiler: cl
+ container: null
- os: ubuntu-latest
- c_compiler: clang
- cpp_compiler: clang++
- - os: macos-latest
- c_compiler: clang
- cpp_compiler: clang++
+ toolchain: gcc
+ c_compiler: gcc
+ cpp_compiler: g++
+ # The manylinux container is to ensure ABI compatibility with glibc 2.28.
+ # This way, the continuous delivery process casts a wide net across many linux distros.
+ container: dockcross/manylinux_2_28-x64:latest
exclude:
- - os: windows-latest
- c_compiler: clang
- - os: windows-latest
- c_compiler: cl
- build_type: Debug
- - os: ubuntu-latest
- c_compiler: cl
- - os: macos-latest
- c_compiler: cl
+ - os: macos-latest
+ toolchain: msvc
+ - os: macos-latest
+ toolchain: gcc
+ - os: ubuntu-latest
+ toolchain: msvc
+ - os: ubuntu-latest
+ toolchain: clang
+ - os: windows-latest
+ toolchain: clang
+ - os: windows-latest
+ toolchain: gcc
- name: CMake ${{ matrix.os }} ${{ matrix.build_type }} (${{ matrix.c_compiler }})
+ name: CMake-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.toolchain }}
runs-on: ${{ matrix.os }}
+ container: ${{ matrix.container }}
+ env:
+ SCCACHE_GHA_ENABLED: "true"
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- - name: Set reusable strings
- # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
- id: strings
- shell: bash
- run: |
- echo "build-output-dir=${{ github.workspace }}/out/build" >> "$GITHUB_OUTPUT"
-
- - name: Install Ubuntu build dependencies
- if: matrix.os == 'ubuntu-latest'
- run: |
- sudo apt update
- sudo apt install libgl-dev libx11-xcb-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev wayland-protocols libwayland-dev libxkbcommon-dev
-
- - name: Set up Python
- uses: actions/setup-python@v4
- with:
- python-version: 3.11
-
- - name: Fetch dependencies
- run: python ./tools/fetch_dawn_dependencies.py --use-test-deps --shallow
-
- - name: Set up Ninja
- uses: seanmiddleditch/gha-setup-ninja@master
-
- - name: Set up Visual Studio environment
- if: matrix.os == 'windows-latest'
- uses: seanmiddleditch/gha-setup-vsdevenv@master
+ - name: Set up dependencies on linux
+ if: matrix.container == 'dockcross/manylinux_2_28-x64:latest'
+ run: >
+ dnf install -y mesa-libGL-devel libxcb libxcb-devel libX11-xcb libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel libXext-devel libxkbcommon libxkbcommon-devel libxkbcommon-x11-devel mesa-vulkan-drivers wayland-protocols-devel wayland-devel
- name: Set up sccache
- uses: mozilla-actions/sccache-action@v0.0.3
+ # dawn-ci.cmake documents why sccache is not used in other platforms.
+ if: matrix.os == 'ubuntu-latest'
+ uses: mozilla-actions/sccache-action@v0.0.5
- name: Configure CMake
run: >
- cmake -G Ninja -B ${{ steps.strings.outputs.build-output-dir }}
+ cmake
+ -S .
+ -B out/${{ matrix.build_type }}
+ -C .github/workflows/dawn-ci.cmake
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
- -DCMAKE_C_COMPILER_LAUNCHER=sccache
- -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
- -S ${{ github.workspace }}
- env:
- SCCACHE_GHA_ENABLED: "true"
- name: Build
- run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
- env:
- SCCACHE_GHA_ENABLED: "true"
+ run: cmake --build out/${{ matrix.build_type }} --config ${{ matrix.build_type }}
+
+ - name: Package
+ run: |
+ cmake --install out/${{ matrix.build_type }} --config ${{ matrix.build_type }} --prefix Dawn-${{ github.sha }}-${{ matrix.os }}-${{ matrix.build_type }}
+ cmake -E tar cvzf Dawn-${{ github.sha }}-${{ matrix.os }}-${{ matrix.build_type }}.tar.gz Dawn-${{ github.sha }}-${{ matrix.os }}-${{ matrix.build_type }}
+
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: Dawn-${{ github.sha }}-${{ matrix.os }}-${{ matrix.build_type }}
+ path: Dawn-${{ github.sha }}-${{ matrix.os }}-${{ matrix.build_type }}.tar.gz
golang:
name: Go Build and Test
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
diff --git a/.github/workflows/dawn-ci.cmake b/.github/workflows/dawn-ci.cmake
new file mode 100644
index 0000000..b2e2cb3
--- /dev/null
+++ b/.github/workflows/dawn-ci.cmake
@@ -0,0 +1,16 @@
+# This file caches variables which are platform specific.
+if (WIN32)
+ set(DAWN_USE_BUILT_DXC ON CACHE BOOL "")
+endif ()
+set(DAWN_FETCH_DEPENDENCIES ON CACHE BOOL "")
+set(DAWN_ENABLE_INSTALL ON CACHE BOOL "")
+
+if (CMAKE_SYTEM_NAME STREQUAL "Linux")
+ # `sccache` seems effective only on linux.
+ # for windows, we could look into `buildcache`
+ # for macos, `sccache` causes an argument parse error for clang
+ # similar to https://github.com/fastbuild/fastbuild/issues/1041
+ # maybe we could use `ccache` in macos.
+ set(CMAKE_C_COMPILER_LAUNCHER "sccache" CACHE STRING "")
+ set(CMAKE_CXX_COMPILER_LAUNCHER "sccache" CACHE STRING "")
+endif ()
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index 26e5c0e..65678a7 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -910,5 +910,4 @@
# doesn't work well with shared libs
if (DAWN_USE_BUILT_DXC)
target_link_libraries(dawn_native PRIVATE dxcompiler)
- target_link_libraries(webgpu_dawn PRIVATE dxcompiler)
endif()
diff --git a/tools/fetch_dawn_dependencies.py b/tools/fetch_dawn_dependencies.py
index 0251b74..3199c00 100644
--- a/tools/fetch_dawn_dependencies.py
+++ b/tools/fetch_dawn_dependencies.py
@@ -97,6 +97,8 @@
# Dependencies of dependencies are prefixed by their ancestors.
required_submodules = [
'third_party/abseil-cpp',
+ 'third_party/dxc',
+ 'third_party/dxheaders',
'third_party/glfw',
'third_party/jinja2',
'third_party/khronos/EGL-Registry',
