Skip to content

Commit 93b56e1

Browse files
authored
kokoro: reorg build config dirs to match their names (KhronosGroup#6573)
1 parent 69f1c0d commit 93b56e1

9 files changed

Lines changed: 21 additions & 11 deletions

File tree

kokoro/check-format/presubmit_check_format.cfg renamed to kokoro/check-format/continuous.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Presubmit build configuration.
1615
build_file: "SPIRV-Tools/kokoro/check-format/build.sh"

kokoro/check-format/presubmit.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) 2018 Google LLC.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
build_file: "SPIRV-Tools/kokoro/check-format/build.sh"

kokoro/scripts/linux/build-docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ set -x
2222

2323
# This is required to run any git command in the docker since owner will
2424
# have changed between the clone environment, and the docker container.
25-
# Marking the root of the repo as safe for ownership changes.
26-
git config --global --add safe.directory $ROOT_DIR
25+
# Mark all repositories as safe for ownership changes.
26+
git config --global --add safe.directory '*'
2727

2828
. /bin/using.sh # Declare the bash `using` function for configuring toolchains.
2929

File renamed without changes.

kokoro/windows-msvc-2022-debug/continuous.cfg renamed to kokoro/windows-vs2022-amd64-debug/continuous.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Continuous build configuration.
16-
build_file: "SPIRV-Tools/kokoro/windows-msvc-2022-debug/build.bat"
15+
build_file: "SPIRV-Tools/kokoro/windows-vs2022-amd64-debug/build.bat"
1716

1817
action {
1918
define_artifacts {

kokoro/windows-msvc-2022-debug/presubmit.cfg renamed to kokoro/windows-vs2022-amd64-debug/presubmit.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Presubmit build configuration.
16-
build_file: "SPIRV-Tools/kokoro/windows-msvc-2022-debug/build.bat"
15+
build_file: "SPIRV-Tools/kokoro/windows-vs2022-amd64-debug/build.bat"
File renamed without changes.

kokoro/windows-msvc-2022-release/continuous.cfg renamed to kokoro/windows-vs2022-amd64-release/continuous.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Continuous build configuration.
16-
build_file: "SPIRV-Tools/kokoro/windows-msvc-2022-release/build.bat"
15+
build_file: "SPIRV-Tools/kokoro/windows-vs2022-amd64-release/build.bat"
1716

1817
action {
1918
define_artifacts {

kokoro/windows-msvc-2022-release/presubmit.cfg renamed to kokoro/windows-vs2022-amd64-release/presubmit.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Presubmit build configuration.
16-
build_file: "SPIRV-Tools/kokoro/windows-msvc-2022-release/build.bat"
15+
build_file: "SPIRV-Tools/kokoro/windows-vs2022-amd64-release/build.bat"

0 commit comments

Comments
 (0)