Skip to content

Commit

Permalink
Release 0.55.0 (2024-02-22)
Browse files Browse the repository at this point in the history
* Normalize bazel symlinks to a resolved path
* Pass the correct path for normalize-bazel-symlinks

Bug: 323259768
Change-Id: I2e4cb80ac9d4bbf2eeee4f69dc3fe9454e3d7b6b
GitOrigin-RevId: f5f1df80f4c7f55521b3a6aa6e84721f86dbe899
  • Loading branch information
Privacy Sandbox Team authored and pmeric committed Feb 22, 2024
1 parent 5845e70 commit e52121a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.

## 0.55.0 (2024-02-22)


### Bug Fixes

* Normalize bazel symlinks to a resolved path
* Pass the correct path for normalize-bazel-symlinks

## 0.54.0 (2024-02-09)


Expand Down
2 changes: 1 addition & 1 deletion tools/cbuild
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ if [[ ${VERBOSE} -eq 1 ]]; then
printf "mounting workspace into container: %s\n" "${WORKSPACE_MOUNT}" &>/dev/stderr
fi

TOOLS_RELDIR="$(realpath "${TOOLS_DIR}" --relative-to="${WORKSPACE}")"
TOOLS_RELDIR="$(realpath "${TOOLS_DIR}" --relative-to="${PWD}")"
readonly TOOLS_RELDIR

if [[ -n ${CBUILD_IMAGE} ]]; then
Expand Down
8 changes: 5 additions & 3 deletions tools/normalize-bazel-symlinks
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function normalize_symlink() {
local -r link_path="$(readlink "${link_name}")"
local -r output_user_root="${link_path///bazel_root/}"
rm -f "${link_name}"
ln -s "${BAZEL_CACHE_DIR}/${output_user_root}" "${link_name}"
ln -s "$(realpath "${BAZEL_CACHE_DIR}/${output_user_root}")" "${link_name}"
}

function normalize_symlink_docker() {
Expand All @@ -35,7 +35,7 @@ function normalize_symlink_docker() {
local -r link_path="$(readlink "${link_name}")"
local -r output_user_root="${link_path##*/.cache/bazel/}"
rm -f "${link_name}"
ln -s "/bazel_root/${output_user_root}" "${link_name}"
ln -s "$(realpath "/bazel_root/${output_user_root}")" "${link_name}"
}

declare _normalize_fn=normalize_symlink
Expand All @@ -50,5 +50,7 @@ declare -a -r LINK_DIRS=(
bazel-workspace
)
for link in "${LINK_DIRS[@]}"; do
${_normalize_fn} "${link}"
if [[ -L ${link} ]]; then
${_normalize_fn} "${link}"
fi
done
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.54.0
0.55.0

0 comments on commit e52121a

Please sign in to comment.