Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Avoid using Alias #31

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
*logs
*actions
*notifications
*tools
plugins
user_trunk.yaml
user.yaml
# TODO(lauri): Remove shims after a release or two
shims
tools
12 changes: 6 additions & 6 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
version: 0.1
cli:
version: 1.12.0
version: 1.15.0
plugins:
sources:
- id: trunk
ref: v0.0.21
ref: v1.2.3
uri: https://github.com/trunk-io/plugins
- id: configs
uri: https://github.com/trunk-io/configs
ref: v0.0.3
ref: v0.0.7
lint:
disabled:
- eslint
enabled:
- git-diff-check
- markdownlint@0.35.0
- prettier@3.0.0
- trufflehog@3.43.0
- markdownlint@0.36.0
- prettier@3.0.3
- trufflehog@3.54.3
ignore:
- linters: [ALL]
paths:
Expand Down
7 changes: 4 additions & 3 deletions src/scripts/compute_impacted_targets.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env bash

set -euo pipefail
shopt -s expand_aliases

if [[ (-z ${MERGE_INSTANCE_BRANCH}) || (-z ${PR_BRANCH}) ]]; then
echo "Missing branch"
Expand Down Expand Up @@ -36,8 +35,10 @@ _bazel() {
${BAZEL_PATH} ${bazel_startup_options} "$@"
}

# trunk-ignore(shellcheck)
alias _java=$(_bazel info java-home)/bin/java
_java() {
# trunk-ignore(shellcheck/SC2046)
$(_bazel info java-home)/bin/java "$@"
}

bazelDiff() {
if [[ -n ${VERBOSE} ]]; then
Expand Down