From 085db1cdbe9fa06401e12db3453c75229ec4e383 Mon Sep 17 00:00:00 2001 From: "Aalyria Technologies, Inc" Date: Thu, 29 Jun 2023 18:27:46 +0000 Subject: [PATCH 1/2] Project import generated by Copybara. GitOrigin-RevId: b449a1e24400824782dda1045bd275ccf7d6b4a3 --- .github/workflows/main.yml | 10 ++++++++-- patches/BUILD | 14 ++++++++++++++ tools/gopackagesdriver.sh | 17 +++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100755 tools/gopackagesdriver.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1773491..7958aac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +name: Bazel + on: [pull_request] jobs: @@ -19,9 +21,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Mount bazel cache - uses: actions/cache@v3 + - uses: actions/cache@v3 with: path: "~/.cache/bazel" key: bazel + path: | + ~/.cache/bazelisk + ~/.cache/bazel + key: bazel-${{ hashFiles('.bazelrc', '.bazelversion', 'WORKSPACE', 'requirements.txt') }} + restore-keys: bazel- - run: bazelisk build //... diff --git a/patches/BUILD b/patches/BUILD index bb4827b..17ccb7c 100644 --- a/patches/BUILD +++ b/patches/BUILD @@ -1 +1,15 @@ +# Copyright 2023 Aalyria Technologies, Inc., and its affiliates. +# +# 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. + exports_files(["grpc.patch"]) diff --git a/tools/gopackagesdriver.sh b/tools/gopackagesdriver.sh new file mode 100755 index 0000000..d4d5d4b --- /dev/null +++ b/tools/gopackagesdriver.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# +# Copyright 2023 Aalyria Technologies, Inc., and its affiliates. +# +# 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. + +exec bazel run -- @io_bazel_rules_go//go/tools/gopackagesdriver "${@}" From 9dcf4bd9edf64f28bba243190ffec25aedafb61f Mon Sep 17 00:00:00 2001 From: Ciaran Downey Date: Thu, 29 Jun 2023 12:05:26 -0700 Subject: [PATCH 2/2] Remove duplicate key --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7958aac..027e62f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,8 +23,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions/cache@v3 with: - path: "~/.cache/bazel" - key: bazel path: | ~/.cache/bazelisk ~/.cache/bazel