From 96f7c05ea6f84b51c36cf97b77bd0bb0889567fe Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Sat, 23 Dec 2023 17:18:39 -0500 Subject: [PATCH] Update to latest bazel --- .bazelversion | 1 + .bazelversion.license | 30 ++++++++++++++++++++++++++++++ .gitattributes | 2 ++ .github/workflows/ci.yml | 26 +++++++++++++------------- .github/workflows/codeql.yml | 2 +- BUILD.bazel | 1 + MODULE.bazel | 6 +++--- WORKSPACE.bazel | 16 ++++++++-------- triggers | 34 ++++++++++++++++++++++++++++++++++ 9 files changed, 93 insertions(+), 25 deletions(-) create mode 100644 .bazelversion create mode 100644 .bazelversion.license create mode 100755 triggers diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 0000000..a0f9a4b --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +latest diff --git a/.bazelversion.license b/.bazelversion.license new file mode 100644 index 0000000..0c0760b --- /dev/null +++ b/.bazelversion.license @@ -0,0 +1,30 @@ +.bazelversion +AVO2 Library + +SPDX-FileCopyrightText: 2010 University of North Carolina at Chapel Hill +SPDX-License-Identifier: Apache-2.0 + +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 + + https://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. + +Please send all bug reports to . + +The authors may be contacted via: + +Jur van den Berg, Jamie Snape, Stephen J. Guy, and Dinesh Manocha +Dept. of Computer Science +201 S. Columbia St. +Frederick P. Brooks, Jr. Computer Science Bldg. +Chapel Hill, N.C. 27599-3175 +United States of America + + diff --git a/.gitattributes b/.gitattributes index e828155..8e34067 100644 --- a/.gitattributes +++ b/.gitattributes @@ -63,6 +63,7 @@ .bazelignore text whitespace-4 .bazelrc text whitespace-4 +.bazelversion text whitespace-4 .clang-format text whitespace-2 .clang-tidy text whitespace-2 .dockerignore text whitespace-2 @@ -78,6 +79,7 @@ Dockerfile text whitespace-2 LICENSE text linguist-documentation linguist-vendored whitespace-0 README.md linguist-documentation requirements.txt whitespace-2 +triggers whitespace-0 .circleci/** export-ignore .github/** export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f6355d..eccf6db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: /var/lib/pacman/sync/* shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: bazel test --enable_bzlmod=0 --flaky_test_attempts=3 ... shell: bash @@ -74,7 +74,7 @@ jobs: runs-on: macos-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup run: | rm -f \ @@ -140,7 +140,7 @@ jobs: DEBIAN_FRONTEND: noninteractive shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: bazel test --enable_bzlmod=0 --flaky_test_attempts=3 ... shell: bash @@ -164,7 +164,7 @@ jobs: /var/lib/pacman/sync/* shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: bazel test --enable_bzlmod=1 --flaky_test_attempts=3 ... shell: bash @@ -174,7 +174,7 @@ jobs: runs-on: macos-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup run: | rm -f \ @@ -240,7 +240,7 @@ jobs: DEBIAN_FRONTEND: noninteractive shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: bazel test --enable_bzlmod=1 --flaky_test_attempts=3 ... shell: bash @@ -264,7 +264,7 @@ jobs: pkgconf shell: sh - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: | mkdir _build @@ -308,7 +308,7 @@ jobs: /var/lib/pacman/sync/* shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: | mkdir _build @@ -355,7 +355,7 @@ jobs: rm -rf /var/cache/yum shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: | mkdir _build @@ -383,7 +383,7 @@ jobs: runs-on: macos-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup run: | rm -f \ @@ -459,7 +459,7 @@ jobs: rm -rf /var/cache/yum shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: | mkdir _build @@ -522,7 +522,7 @@ jobs: DEBIAN_FRONTEND: noninteractive shell: bash - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: build test package run: | mkdir _build @@ -550,7 +550,7 @@ jobs: runs-on: windows-latest steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup run: | choco upgrade cmake.install -r -y --install-arguments=ADD_CMAKE_TO_PATH=System ` diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bd78eeb..21e85b7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: initialize codeql uses: github/codeql-action/init@v2 with: diff --git a/BUILD.bazel b/BUILD.bazel index a64fef5..abb7fe9 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -170,6 +170,7 @@ pkg_deb( package = "avo", priority = "optional", section = "libdevel", + triggers = "triggers", version = "1.0.1", visibility = ["//visibility:private"], ) diff --git a/MODULE.bazel b/MODULE.bazel index a91892a..00b6967 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -41,7 +41,7 @@ module( bazel_dep( name = "apple_support", - version = "1.6.0", + version = "1.11.1", repo_name = "build_bazel_apple_support" ) @@ -51,6 +51,6 @@ apple_cc_configure = use_extension( ) use_repo(apple_cc_configure, "local_config_apple_cc") -bazel_dep(name = "rules_cc", version = "0.0.6") -bazel_dep(name = "rules_license", version = "0.0.4") +bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "rules_license", version = "0.0.7") bazel_dep(name = "rules_pkg", version = "0.9.1", dev_dependency = True) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 29eb83c..eb353c3 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -40,8 +40,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "build_bazel_apple_support", - sha256 = "9f7bb62c3ae889e0eae8c18458fd8764e2e537687d9a1d85885d6af980e4fc31", - urls = ["https://github.com/bazelbuild/apple_support/releases/download/1.6.0/apple_support.1.6.0.tar.gz"], + sha256 = "cf4d63f39c7ba9059f70e995bf5fe1019267d3f77379c2028561a5d7645ef67c", + urls = ["https://github.com/bazelbuild/apple_support/releases/download/1.11.1/apple_support.1.11.1.tar.gz"], ) load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") @@ -50,9 +50,9 @@ apple_support_dependencies() http_archive( name = "rules_cc", - sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40", - strip_prefix = "rules_cc-0.0.6", - urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz"], + sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf", + strip_prefix = "rules_cc-0.0.9", + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"], ) load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains") @@ -63,10 +63,10 @@ rules_cc_toolchains() http_archive( name = "rules_license", - sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381", + sha256 = "4531deccb913639c30e5c7512a054d5d875698daeb75d8cf90f284375fe7c360", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz", - "https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz", + "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz", ], ) diff --git a/triggers b/triggers new file mode 100755 index 0000000..e600064 --- /dev/null +++ b/triggers @@ -0,0 +1,34 @@ +# +# triggers +# AVO2 Library +# +# SPDX-FileCopyrightText: 2010 University of North Carolina at Chapel Hill +# SPDX-License-Identifier: Apache-2.0 +# +# 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 +# +# https://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. +# +# Please send all bug reports to . +# +# The authors may be contacted via: +# +# Jur van den Berg, Jamie Snape, Stephen J. Guy, and Dinesh Manocha +# Dept. of Computer Science +# 201 S. Columbia St. +# Frederick P. Brooks, Jr. Computer Science Bldg. +# Chapel Hill, N.C. 27599-3175 +# United States of America +# +# +# + +interest-await ldconfig