Skip to content

Commit

Permalink
Merge branch 'main' into meson-flags
Browse files Browse the repository at this point in the history
  • Loading branch information
jsharpe authored Jan 1, 2025
2 parents 57a8ef9 + f3d072d commit 5df3572
Show file tree
Hide file tree
Showing 147 changed files with 4,313 additions and 3,285 deletions.
6 changes: 3 additions & 3 deletions .bazelci/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tasks:
- "//..."
test_targets:
- "//..."
# TODO: https://github.com/bazelbuild/rules_foreign_cc/issues/495
# TODO: https://github.com/bazel-contrib/rules_foreign_cc/issues/495
- "-//test:shell_method_symlink_contents_to_dir_test"
- "-//test:shell_script_inner_fun_test"
build_flags:
Expand Down Expand Up @@ -233,7 +233,7 @@ tasks:
- //...
min_supported_version:
name: "Minimum Supported Version"
bazel: "5.4.0"
bazel: "6.5.0"
skip_in_bazel_downstream_pipeline: "Duplicates tests in other targets"
platform: ubuntu1804
build_targets:
Expand All @@ -242,7 +242,7 @@ tasks:
- "//..."
min_supported_version_examples:
name: "Minimum Supported Version Examples"
bazel: "5.4.0"
bazel: "6.5.0"
skip_in_bazel_downstream_pipeline: "Duplicates tests in other targets"
platform: ubuntu1804
working_directory: examples
Expand Down
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.4.1
2 changes: 1 addition & 1 deletion .bcr/metadata.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "James Sharpe"
}
],
"repository": ["github:bazelbuild/rules_foreign_cc"],
"repository": ["github:bazel-contrib/rules_foreign_cc"],
"versions": [],
"yanked_versions": {}
}
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*.bazel linguist-language=Starlark

# TODO: remove once https://github.com/github-linguist/linguist/pull/7121 lands
WORKSPACE.bzlmod linguist-language=Starlark

# .bazelrc are mostly a collection of the CLI arguments, so highlighting them
# as shell scripts looks quite alright and makes them quite readable
.bazelrc linguist-language=Shell
45 changes: 44 additions & 1 deletion .github/docs-0.1.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 0000000..5096728
+title = "Rules ForeignCc"
+
+[output.html]
+git-repository-url = "https://github.com/bazelbuild/rules_foreign_cc"
+git-repository-url = "https://github.com/bazel-contrib/rules_foreign_cc"
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
new file mode 100644
index 0000000..69fbd4d
Expand All @@ -40,3 +40,46 @@ index 0000000..98bb722
+"""A module represeting the version of rules_foreign_cc"""
+
+VERSION = "0.1.0"
diff --git a/docs/.bazelrc b/docs/.bazelrc
new file mode 100644
index 0000000..9eb0697
--- /dev/null
+++ b/docs/.bazelrc
@@ -0,0 +1,7 @@
+# Bazel configuration flags for rules_foreign_cc_docs
+
+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
+build --workspace_status_command=tools/workspace_status.sh
diff --git a/docs/stardoc_repository.bzl b/docs/stardoc_repository.bzl
index 2153aa8..7c63be7 100644
--- a/docs/stardoc_repository.bzl
+++ b/docs/stardoc_repository.bzl
@@ -7,9 +7,9 @@ def stardoc_repository():
maybe(
http_archive,
name = "io_bazel_stardoc",
+ sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
urls = [
- "https://github.com/bazelbuild/stardoc/archive/a0f330bcbae44ffc59d50a86a830a661b8d18acc.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
],
- sha256 = "e12831c6c414325c99325726dd26dabd8ed4c9efa7b4f27b4d1d9594ec7dfc40",
- strip_prefix = "stardoc-a0f330bcbae44ffc59d50a86a830a661b8d18acc",
)
diff --git a/docs/tools/workspace_status.sh b/docs/tools/workspace_status.sh
new file mode 100755
index 0000000..5ceb3f7
--- /dev/null
+++ b/docs/tools/workspace_status.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo STABLE_SCM_SHORT_VERSION "$(git rev-parse --short HEAD)"
+echo STABLE_SCM_VERSION "$(git rev-parse HEAD)"
+echo STABLE_RELEASE "$(cat ../version.bzl | grep VERSION | sed 's/VERSION = "//' | sed 's/"//')"
13 changes: 13 additions & 0 deletions .github/docs-0.10.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/docs/.bazelrc b/docs/.bazelrc
index dc6a3f7..9eb0697 100644
--- a/docs/.bazelrc
+++ b/docs/.bazelrc
@@ -1,3 +1,7 @@
-# Bazel configuration flags for rules_foregin_cc_docs
+# Bazel configuration flags for rules_foreign_cc_docs

+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
build --workspace_status_command=tools/workspace_status.sh
45 changes: 44 additions & 1 deletion .github/docs-0.2.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 0000000..5096728
+title = "Rules ForeignCc"
+
+[output.html]
+git-repository-url = "https://github.com/bazelbuild/rules_foreign_cc"
+git-repository-url = "https://github.com/bazel-contrib/rules_foreign_cc"
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
new file mode 100644
index 0000000..69fbd4d
Expand All @@ -40,3 +40,46 @@ index 0000000..98bb722
+"""A module represeting the version of rules_foreign_cc"""
+
+VERSION = "0.2.0"
diff --git a/docs/.bazelrc b/docs/.bazelrc
new file mode 100644
index 0000000..9eb0697
--- /dev/null
+++ b/docs/.bazelrc
@@ -0,0 +1,7 @@
+# Bazel configuration flags for rules_foreign_cc_docs
+
+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
+build --workspace_status_command=tools/workspace_status.sh
diff --git a/docs/stardoc_repository.bzl b/docs/stardoc_repository.bzl
index 2153aa8..7c63be7 100644
--- a/docs/stardoc_repository.bzl
+++ b/docs/stardoc_repository.bzl
@@ -7,9 +7,9 @@ def stardoc_repository():
maybe(
http_archive,
name = "io_bazel_stardoc",
+ sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
urls = [
- "https://github.com/bazelbuild/stardoc/archive/a0f330bcbae44ffc59d50a86a830a661b8d18acc.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
],
- sha256 = "e12831c6c414325c99325726dd26dabd8ed4c9efa7b4f27b4d1d9594ec7dfc40",
- strip_prefix = "stardoc-a0f330bcbae44ffc59d50a86a830a661b8d18acc",
)
diff --git a/docs/tools/workspace_status.sh b/docs/tools/workspace_status.sh
new file mode 100755
index 0000000..5ceb3f7
--- /dev/null
+++ b/docs/tools/workspace_status.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo STABLE_SCM_SHORT_VERSION "$(git rev-parse --short HEAD)"
+echo STABLE_SCM_VERSION "$(git rev-parse HEAD)"
+echo STABLE_RELEASE "$(cat ../version.bzl | grep VERSION | sed 's/VERSION = "//' | sed 's/"//')"
49 changes: 46 additions & 3 deletions .github/docs-0.3.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ index 0000000..5096728
+title = "Rules ForeignCc"
+
+[output.html]
+git-repository-url = "https://github.com/bazelbuild/rules_foreign_cc"
+git-repository-url = "https://github.com/bazel-contrib/rules_foreign_cc"
diff --git a/docs/index.md b/docs/index.md
index 3a91e41..14c8e3b 100644
--- a/docs/index.md
Expand All @@ -49,11 +49,11 @@ index 3a91e41..14c8e3b 100644
- strip_prefix = "rules_foreign_cc-0.2.0",
- url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.2.0.tar.gz",
+ # TODO: Get the latest sha256 value from the latest release on the releases page
+ # https://github.com/bazelbuild/rules_foreign_cc/releases
+ # https://github.com/bazel-contrib/rules_foreign_cc/releases
+ #
+ # sha256 = "...",
+ strip_prefix = "rules_foreign_cc-0.3.0",
+ url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.3.0.tar.gz",
+ url = "https://github.com/bazel-contrib/rules_foreign_cc/archive/0.3.0.tar.gz",
)

load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
Expand All @@ -80,3 +80,46 @@ index 0000000..98bb722
+"""A module represeting the version of rules_foreign_cc"""
+
+VERSION = "0.3.0"
diff --git a/docs/.bazelrc b/docs/.bazelrc
new file mode 100644
index 0000000..9eb0697
--- /dev/null
+++ b/docs/.bazelrc
@@ -0,0 +1,7 @@
+# Bazel configuration flags for rules_foreign_cc_docs
+
+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
+build --workspace_status_command=tools/workspace_status.sh
diff --git a/docs/stardoc_repository.bzl b/docs/stardoc_repository.bzl
index 2153aa8..7c63be7 100644
--- a/docs/stardoc_repository.bzl
+++ b/docs/stardoc_repository.bzl
@@ -7,9 +7,9 @@ def stardoc_repository():
maybe(
http_archive,
name = "io_bazel_stardoc",
+ sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
urls = [
- "https://github.com/bazelbuild/stardoc/archive/a0f330bcbae44ffc59d50a86a830a661b8d18acc.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
],
- sha256 = "e12831c6c414325c99325726dd26dabd8ed4c9efa7b4f27b4d1d9594ec7dfc40",
- strip_prefix = "stardoc-a0f330bcbae44ffc59d50a86a830a661b8d18acc",
)
diff --git a/docs/tools/workspace_status.sh b/docs/tools/workspace_status.sh
new file mode 100755
index 0000000..5ceb3f7
--- /dev/null
+++ b/docs/tools/workspace_status.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo STABLE_SCM_SHORT_VERSION "$(git rev-parse --short HEAD)"
+echo STABLE_SCM_VERSION "$(git rev-parse HEAD)"
+echo STABLE_RELEASE "$(cat ../version.bzl | grep VERSION | sed 's/VERSION = "//' | sed 's/"//')"
40 changes: 40 additions & 0 deletions .github/docs-0.4.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,43 @@ index 2bdbf6e..418dd13 100644
release="\\$${RELEASE}"
fi
mkdir -p \\$${BUILD_WORKSPACE_DIRECTORY}/src
diff --git a/docs/.bazelrc b/docs/.bazelrc
index dc6a3f7..9eb0697 100644
--- a/docs/.bazelrc
+++ b/docs/.bazelrc
@@ -1,3 +1,7 @@
-# Bazel configuration flags for rules_foregin_cc_docs
+# Bazel configuration flags for rules_foreign_cc_docs

+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
build --workspace_status_command=tools/workspace_status.sh
diff --git a/docs/stardoc_repository.bzl b/docs/stardoc_repository.bzl
index 2153aa8..7c63be7 100644
--- a/docs/stardoc_repository.bzl
+++ b/docs/stardoc_repository.bzl
@@ -7,9 +7,9 @@ def stardoc_repository():
maybe(
http_archive,
name = "io_bazel_stardoc",
+ sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
urls = [
- "https://github.com/bazelbuild/stardoc/archive/a0f330bcbae44ffc59d50a86a830a661b8d18acc.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
],
- sha256 = "e12831c6c414325c99325726dd26dabd8ed4c9efa7b4f27b4d1d9594ec7dfc40",
- strip_prefix = "stardoc-a0f330bcbae44ffc59d50a86a830a661b8d18acc",
)
diff --git a/docs/tools/workspace_status.sh b/docs/tools/workspace_status.sh
index eaec25a..5ceb3f7 100755
--- a/docs/tools/workspace_status.sh
+++ b/docs/tools/workspace_status.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

set -euo pipefail

40 changes: 40 additions & 0 deletions .github/docs-0.5.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/docs/.bazelrc b/docs/.bazelrc
index dc6a3f7..9eb0697 100644
--- a/docs/.bazelrc
+++ b/docs/.bazelrc
@@ -1,3 +1,7 @@
-# Bazel configuration flags for rules_foregin_cc_docs
+# Bazel configuration flags for rules_foreign_cc_docs

+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
build --workspace_status_command=tools/workspace_status.sh
diff --git a/docs/stardoc_repository.bzl b/docs/stardoc_repository.bzl
index 2153aa8..7c63be7 100644
--- a/docs/stardoc_repository.bzl
+++ b/docs/stardoc_repository.bzl
@@ -7,9 +7,9 @@ def stardoc_repository():
maybe(
http_archive,
name = "io_bazel_stardoc",
+ sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
urls = [
- "https://github.com/bazelbuild/stardoc/archive/a0f330bcbae44ffc59d50a86a830a661b8d18acc.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
],
- sha256 = "e12831c6c414325c99325726dd26dabd8ed4c9efa7b4f27b4d1d9594ec7dfc40",
- strip_prefix = "stardoc-a0f330bcbae44ffc59d50a86a830a661b8d18acc",
)
diff --git a/docs/tools/workspace_status.sh b/docs/tools/workspace_status.sh
index eaec25a..5ceb3f7 100755
--- a/docs/tools/workspace_status.sh
+++ b/docs/tools/workspace_status.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

set -euo pipefail

40 changes: 40 additions & 0 deletions .github/docs-0.5.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/docs/.bazelrc b/docs/.bazelrc
index dc6a3f7..9eb0697 100644
--- a/docs/.bazelrc
+++ b/docs/.bazelrc
@@ -1,3 +1,7 @@
-# Bazel configuration flags for rules_foregin_cc_docs
+# Bazel configuration flags for rules_foreign_cc_docs

+# https://github.com/bazelbuild/stardoc/issues/112
+common --incompatible_allow_tags_propagation
+
+common --noenable_bzlmod
build --workspace_status_command=tools/workspace_status.sh
diff --git a/docs/stardoc_repository.bzl b/docs/stardoc_repository.bzl
index 2153aa8..7c63be7 100644
--- a/docs/stardoc_repository.bzl
+++ b/docs/stardoc_repository.bzl
@@ -7,9 +7,9 @@ def stardoc_repository():
maybe(
http_archive,
name = "io_bazel_stardoc",
+ sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
urls = [
- "https://github.com/bazelbuild/stardoc/archive/a0f330bcbae44ffc59d50a86a830a661b8d18acc.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz",
],
- sha256 = "e12831c6c414325c99325726dd26dabd8ed4c9efa7b4f27b4d1d9594ec7dfc40",
- strip_prefix = "stardoc-a0f330bcbae44ffc59d50a86a830a661b8d18acc",
)
diff --git a/docs/tools/workspace_status.sh b/docs/tools/workspace_status.sh
index eaec25a..5ceb3f7 100755
--- a/docs/tools/workspace_status.sh
+++ b/docs/tools/workspace_status.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

set -euo pipefail

Loading

0 comments on commit 5df3572

Please sign in to comment.