From 4fea5f40a9075f3ba205ede0b453010cf080e194 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 2 Mar 2022 13:34:05 -0500 Subject: [PATCH] chore: fix license header in build.bat (#1363) * chore: fix license header in build.bat * chore: add disctribution field for setup-java action --- .../.github/workflows/samples.yaml | 1 + .../templates/java_library/.kokoro/build.bat | 30 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml b/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml index de737e92a..912ed8b2b 100644 --- a/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml +++ b/synthtool/gcp/templates/java_library/.github/workflows/samples.yaml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: + distribution: zulu java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/synthtool/gcp/templates/java_library/.kokoro/build.bat b/synthtool/gcp/templates/java_library/.kokoro/build.bat index cc602c9eb..067cf4a4c 100644 --- a/synthtool/gcp/templates/java_library/.kokoro/build.bat +++ b/synthtool/gcp/templates/java_library/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: Copyright 2022 Google LLC +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: Github action job to test core java library features on +:: downstream client libraries before they are released. :: See documentation in type-shell-output.bat -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# Github action job to test core java library features on -# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh