Skip to content

Commit 3af408e

Browse files
authored
Merge branch 'main' into mbg/go/old-version-format-is-ok-again
2 parents 0d9a0dd + 7e569b4 commit 3af408e

2,678 files changed

Lines changed: 148035 additions & 93191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ common --enable_platform_specific_config
22
# because we use --override_module with `%workspace%`, the lock file is not stable
33
common --lockfile_mode=off
44

5+
# Build release binaries by default, can be overwritten to in local.bazelrc and set to `fastbuild` or `dbg`
6+
build --compilation_mode opt
7+
58
# when building from this repository in isolation, the internal repository will not be found at ..
69
# where `MODULE.bazel` looks for it. The following will get us past the module loading phase, so
710
# that we can build things that do not rely on that

.devcontainer/swift/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

.devcontainer/swift/devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/swift/root.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

.devcontainer/swift/update-codeql.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

.devcontainer/swift/user.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/swift.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v4
5050
- uses: ./swift/actions/build-and-test
51-
build-and-test-linux:
52-
if: github.repository_owner == 'github'
53-
runs-on: ubuntu-22.04
54-
steps:
55-
- uses: actions/checkout@v4
56-
- uses: ./swift/actions/build-and-test
5751
qltests-macos:
5852
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
5953
needs: build-and-test-macos

Cargo.lock

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MODULE.bazel

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ local_path_override(
1414

1515
# see https://registry.bazel.build/ for a list of available packages
1616

17-
bazel_dep(name = "platforms", version = "0.0.10")
17+
bazel_dep(name = "platforms", version = "0.0.11")
1818
bazel_dep(name = "rules_go", version = "0.50.1")
1919
bazel_dep(name = "rules_pkg", version = "1.0.1")
2020
bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
@@ -28,7 +28,7 @@ bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
2828
bazel_dep(name = "gazelle", version = "0.40.0")
2929
bazel_dep(name = "rules_dotnet", version = "0.17.4")
3030
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
31-
bazel_dep(name = "rules_rust", version = "0.52.2")
31+
bazel_dep(name = "rules_rust", version = "0.57.1")
3232
bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
3333

3434
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
@@ -53,15 +53,6 @@ use_repo(rust, "rust_toolchains")
5353

5454
register_toolchains("@rust_toolchains//:all")
5555

56-
rust_host_tools = use_extension("@rules_rust//rust:extensions.bzl", "rust_host_tools")
57-
58-
# Don't download a second toolchain as host toolchain, make sure this is the same version as above
59-
# The host toolchain is used for vendoring dependencies.
60-
rust_host_tools.host_tools(
61-
edition = RUST_EDITION,
62-
version = RUST_VERSION,
63-
)
64-
6556
# deps for python extractor
6657
# keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
6758
py_deps = use_extension("//misc/bazel/3rdparty:py_deps_extension.bzl", "p")
@@ -125,6 +116,7 @@ use_repo(
125116
"vendor__serde_with-3.12.0",
126117
"vendor__stderrlog-0.6.0",
127118
"vendor__syn-2.0.96",
119+
"vendor__toml-0.8.19",
128120
"vendor__tracing-0.1.41",
129121
"vendor__tracing-subscriber-0.3.19",
130122
"vendor__tree-sitter-0.24.6",
@@ -217,6 +209,7 @@ use_repo(
217209
"kotlin-compiler-2.0.0-RC1",
218210
"kotlin-compiler-2.0.20-Beta2",
219211
"kotlin-compiler-2.1.0-Beta1",
212+
"kotlin-compiler-2.1.20-Beta1",
220213
"kotlin-compiler-embeddable-1.5.0",
221214
"kotlin-compiler-embeddable-1.5.10",
222215
"kotlin-compiler-embeddable-1.5.20",
@@ -231,6 +224,7 @@ use_repo(
231224
"kotlin-compiler-embeddable-2.0.0-RC1",
232225
"kotlin-compiler-embeddable-2.0.20-Beta2",
233226
"kotlin-compiler-embeddable-2.1.0-Beta1",
227+
"kotlin-compiler-embeddable-2.1.20-Beta1",
234228
"kotlin-stdlib-1.5.0",
235229
"kotlin-stdlib-1.5.10",
236230
"kotlin-stdlib-1.5.20",
@@ -245,6 +239,7 @@ use_repo(
245239
"kotlin-stdlib-2.0.0-RC1",
246240
"kotlin-stdlib-2.0.20-Beta2",
247241
"kotlin-stdlib-2.1.0-Beta1",
242+
"kotlin-stdlib-2.1.20-Beta1",
248243
)
249244

250245
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")

0 commit comments

Comments
 (0)