mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-12-25 01:01:04 +00:00
roll deps (#5243)
* Roll external/effcee/ 66edefd2b..77a53ba53 (1 commit)66edefd2bb...77a53ba53b
$ git log 66edefd2b..77a53ba53 --date=short --no-merges --format='%ad %ae %s' 2023-05-26 dneto Add Abseil dependency, via RE2 Created with: roll-dep external/effcee * Roll external/re2/ c9cba7606..03da4fc08 (18 commits)c9cba76063...03da4fc085
$ git log c9cba7606..03da4fc08 --date=short --no-merges --format='%ad %ae %s' 2023-05-26 junyer Use `--enable_platform_specific_config` in `.bazelrc`. 2023-05-24 junyer Call `find_package()` conditionally. 2023-05-19 junyer Install CMake in the `gcc:13` container. 2023-05-19 junyer Sigh. I forgot to omit `sudo` because running under Docker. 2023-05-19 junyer Fix the CMake build on Ubuntu. 2023-05-19 junyer Try building the testing for RE2 with CMake again. 2023-05-18 junyer Uhh. Fix `LDABSL` for sure this time. 2023-05-18 junyer Try one more time to fix the GNU make build with GCC on Ubuntu. 2023-05-18 junyer For now, stop building the testing for RE2 with CMake. 2023-05-18 junyer Revert "Try `x64-windows-static` for CMake on Windows." 2023-05-18 junyer Try `x64-windows-static` for CMake on Windows. 2023-05-18 junyer Try again to fix the CI workflows. 2023-05-17 junyer Try to fix the CMake CI workflow. 2023-05-17 junyer Try to fix the GNU make CI workflow. 2023-05-17 junyer Fix the GNU make and CMake configurations and CI workflows. 2023-05-17 junyer Copy over the `re2/` and `util/` subdirectories. 2023-05-15 junyer Copy over the Bazel configuration and the workflow for Python releases. 2023-05-15 junyer Copy over the `app/` and `python/` subdirectories. Created with: roll-dep external/re2 * Update WORKSPACE to work with the new RE2. * Do not build tests with VS2017 RE2 no longer supports VS2017, so we cannot build the tests anymore. We will continue to make sure the everything else still builds with vs2017. --------- Co-authored-by: GitHub Actions[bot] <> Co-authored-by: Steven Perron <stevenperron@google.com>
This commit is contained in:
parent
182fd9ebce
commit
c7e436921a
4
DEPS
4
DEPS
@ -5,14 +5,14 @@ vars = {
|
||||
|
||||
'abseil_revision': '79ca5d7aad63973c83a4962a66ab07cd623131ea',
|
||||
|
||||
'effcee_revision': '66edefd2bb641de8a2f46b476de21f227fc03a28',
|
||||
'effcee_revision': 'ef0a5c1528fe9850b65c6b8e6a3ab9039b92b685',
|
||||
|
||||
'googletest_revision': '45804691223635953f311cf31a10c632553bbfc3',
|
||||
|
||||
# Use protobufs before they gained the dependency on abseil
|
||||
'protobuf_revision': 'v21.12',
|
||||
|
||||
're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761',
|
||||
're2_revision': '03da4fc0857c285e3a26782f6bc8931c4c950df4',
|
||||
'spirv_headers_revision': '69155b22b3b1f2d0cfed48f59167d9792de1fd79',
|
||||
}
|
||||
|
||||
|
13
WORKSPACE
13
WORKSPACE
@ -1,3 +1,11 @@
|
||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||
|
||||
http_archive(
|
||||
name = "bazel_skylib",
|
||||
strip_prefix = "bazel-skylib-main",
|
||||
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/main.zip"],
|
||||
)
|
||||
|
||||
local_repository(
|
||||
name = "spirv_headers",
|
||||
path = "external/spirv-headers",
|
||||
@ -17,3 +25,8 @@ local_repository(
|
||||
name = "com_google_effcee",
|
||||
path = "external/effcee",
|
||||
)
|
||||
|
||||
local_repository(
|
||||
name = "com_google_absl",
|
||||
path = "external/abseil_cpp",
|
||||
)
|
||||
|
@ -30,6 +30,9 @@ set PATH=C:\python36;"C:\Program Files\cmake-3.23.1-windows-x86_64\bin";%PATH%
|
||||
if %VS_VERSION% == 2017 (
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||
echo "Using VS 2017..."
|
||||
|
||||
:: RE2 does not support VS2017, we we must disable tests.
|
||||
set BUILD_TESTS=NO
|
||||
) else if %VS_VERSION% == 2019 (
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||
echo "Using VS 2019..."
|
||||
@ -56,6 +59,10 @@ set CMAKE_FLAGS=-DCMAKE_INSTALL_PREFIX=%KOKORO_ARTIFACTS_DIR%\install -GNinja -D
|
||||
:: Build spirv-fuzz
|
||||
set CMAKE_FLAGS=%CMAKE_FLAGS% -DSPIRV_BUILD_FUZZER=ON
|
||||
|
||||
if "%BUILD_TESTS%" == "NO" (
|
||||
set CMAKE_FLAGS=-DSPIRV_SKIP_TESTS=ON %CMAKE_FLAGS%
|
||||
)
|
||||
|
||||
cmake %CMAKE_FLAGS% ..
|
||||
|
||||
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
|
||||
@ -71,10 +78,12 @@ setlocal ENABLEDELAYEDEXPANSION
|
||||
:: ################################################
|
||||
:: Run the tests
|
||||
:: ################################################
|
||||
echo "Running Tests... %DATE% %TIME%"
|
||||
ctest -C %BUILD_TYPE% --output-on-failure --timeout 300
|
||||
if !ERRORLEVEL! NEQ 0 exit /b !ERRORLEVEL!
|
||||
echo "Tests Completed %DATE% %TIME%"
|
||||
if "%BUILD_TESTS%" NEQ "NO" (
|
||||
echo "Running Tests... %DATE% %TIME%"
|
||||
ctest -C %BUILD_TYPE% --output-on-failure --timeout 300
|
||||
if !ERRORLEVEL! NEQ 0 exit /b !ERRORLEVEL!
|
||||
echo "Tests Completed %DATE% %TIME%"
|
||||
)
|
||||
|
||||
:: ################################################
|
||||
:: Install and package.
|
||||
|
Loading…
Reference in New Issue
Block a user