Skip to content

Commit

Permalink
Update to latest bazel
Browse files Browse the repository at this point in the history
  • Loading branch information
snape committed Dec 30, 2023
1 parent 01e17be commit 12ed91e
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 30 deletions.
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
latest
30 changes: 30 additions & 0 deletions .bazelversion.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.bazelversion
HRVO Library

SPDX-FileCopyrightText: 2009 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 <geom@cs.unc.edu>.

The authors may be contacted via:

Jamie Snape, Jur van den Berg, 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

<https://gamma.cs.unc.edu/HRVO/>
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@

.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
.editorconfig text whitespace-2
.gitattributes text export-ignore whitespace-2
.gitignore text export-ignore whitespace-2
.zenodo.json linguist-documentation
.zenodo.json export-ignore linguist-documentation
Brewfile text diff=ruby export-ignore whitespace-4
CMakeLists.txt whitespace-2
CODEOWNERS text whitespace-2
Expand All @@ -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
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down Expand Up @@ -141,7 +141,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
Expand All @@ -165,7 +165,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
Expand All @@ -175,7 +175,7 @@ jobs:
runs-on: macos-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup
run: |
rm -f \
Expand Down Expand Up @@ -242,7 +242,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
Expand All @@ -266,7 +266,7 @@ jobs:
pkgconf
shell: sh
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: build test package
run: |
mkdir _build
Expand Down Expand Up @@ -309,7 +309,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
Expand Down Expand Up @@ -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
Expand All @@ -382,7 +382,7 @@ jobs:
runs-on: macos-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup
run: |
rm -f \
Expand Down Expand Up @@ -457,7 +457,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
Expand Down Expand Up @@ -519,7 +519,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive
shell: bash
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: build test package
run: |
mkdir _build
Expand All @@ -546,7 +546,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 `
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ 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
uses: github/codeql-action/init@v3
with:
languages: cpp
- name: autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3
- name: perform codeql analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ pkg_deb(
package = "hrvo",
priority = "optional",
section = "libdevel",
triggers = "triggers",
version = "1.1.0",
visibility = ["//visibility:private"],
)
9 changes: 5 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ module(

bazel_dep(
name = "apple_support",
version = "1.6.0",
repo_name = "build_bazel_apple_support"
version = "1.11.1",
repo_name = "build_bazel_apple_support",
)

apple_cc_configure = use_extension(
Expand All @@ -51,6 +51,7 @@ 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)
16 changes: 8 additions & 8 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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",
],
)

Expand Down
34 changes: 34 additions & 0 deletions triggers
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# triggers
# HRVO Library
#
# SPDX-FileCopyrightText: 2009 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 <geom@cs.unc.edu>.
#
# The authors may be contacted via:
#
# Jamie Snape, Jur van den Berg, 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
#
# <https://gamma.cs.unc.edu/HRVO/>
#

interest-await ldconfig

0 comments on commit 12ed91e

Please sign in to comment.