Skip to content

Commit

Permalink
Merge branch 'master' into philipp/update_bazel
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored May 21, 2024
2 parents d2ca267 + 9211e3d commit 356a5bf
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
.github/workflows/release_prep.sh ${{ env.GITHUB_REF_NAME }} > release_notes.txt
printf '${{ steps.extract-changelog.outputs.markdown }}' >> release_notes.txt
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
draft: true
prerelease: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-flake-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Nix
uses: cachix/install-nix-action@v24
uses: cachix/install-nix-action@V27
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v24
- uses: cachix/install-nix-action@V27
with:
nix_path: nixpkgs=./docs/nixpkgs.nix
- uses: ./.github/actions/configure_bazelrc
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v24
- uses: cachix/install-nix-action@V27
with:
nix_path: nixpkgs=./nixpkgs.nix
- uses: ./.github/actions/configure_bazelrc
Expand Down
5 changes: 4 additions & 1 deletion core/nixpkgs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,10 @@ def _nixpkgs_build_and_symlink(repository_ctx, nix_build_cmd, expr_args, build_f

# Build a forest of symlinks (like new_local_package() does) to the
# Nix store.
for target in find_children(repository_ctx, output_path):
targets = find_children(repository_ctx, output_path)
if not targets:
fail("It appears that your nix store may have a corrupt entry. Found empty directory: {}".format(output_path))
for target in targets:
basename = target.rpartition("/")[-1]
repository_ctx.symlink(target, basename)

Expand Down
5 changes: 4 additions & 1 deletion core/util.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ def find_children(repository_ctx, target_dir):
"-print0",
]
exec_result = execute_or_fail(repository_ctx, find_args)
return exec_result.stdout.rstrip("\000").split("\000")
if exec_result.stdout != "":
return exec_result.stdout.rstrip("\000").split("\000")
else:
return [] # Special case because splitting the empty string yields [""]

def default_constraints(repository_ctx):
"""Calculate the default CPU and OS constraints based on the host platform.
Expand Down
2 changes: 1 addition & 1 deletion docs/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module(
version = "0.11.1",
)

bazel_dep(name = "rules_sh", version = "0.3.0")
bazel_dep(name = "rules_sh", version = "0.4.0")
bazel_dep(name = "io_bazel_stardoc", version = "0.5.1")
6 changes: 3 additions & 3 deletions testing/core/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "platforms",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.6/platforms-0.0.6.tar.gz",
"https://github.com/bazelbuild/platforms/releases/download/0.0.6/platforms-0.0.6.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
"https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
],
sha256 = "5308fc1d8865406a49427ba24a9ab53087f17f5266a7aabbfc28823f3916e1ca",
sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
)

http_archive(
Expand Down
4 changes: 2 additions & 2 deletions testing/nodejs/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# toolchain in particular.
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "dcc55f810142b6cf46a44d0180a5a7fb923c04a5061e2e8d8eb05ccccc60864b",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-5.8.0.tar.gz"],
sha256 = "709cc0dcb51cf9028dd57c268066e5bc8f03a119ded410a13b5c3925d6e43c48",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.4/rules_nodejs-5.8.4.tar.gz"],
)
2 changes: 1 addition & 1 deletion testing/posix/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ local_path_override(
)

bazel_dep(name = "bazel_skylib", version = "1.6.1")
bazel_dep(name = "rules_sh", version = "0.3.0")
bazel_dep(name = "rules_sh", version = "0.4.0")

# TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has
# become a module extension in rules_nixpkgs_java.
Expand Down
6 changes: 3 additions & 3 deletions testing/posix/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ bazel_skylib_workspace()

http_archive(
name = "rules_sh",
sha256 = "d668bb32f112ead69c58bde2cae62f6b8acefe759a8c95a2d80ff6a85af5ac5e",
strip_prefix = "rules_sh-0.3.0",
urls = ["https://github.com/tweag/rules_sh/archive/v0.3.0.tar.gz"],
sha256 = "23a4571ec8afc83db1eae99c0efd0b8b4fa1644069f0340a10f8859e086ba02c",
strip_prefix = "rules_sh-0.4.0",
urls = ["https://github.com/tweag/rules_sh/archive/v0.4.0.tar.gz"],
)

load("@rules_sh//sh:repositories.bzl", "rules_sh_dependencies")
Expand Down

0 comments on commit 356a5bf

Please sign in to comment.