Skip to content

Commit

Permalink
chore: apply lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed Sep 2, 2024
1 parent 7b8169c commit d2c1ae0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
echo "res=[${j%,}]" | tee -a $GITHUB_OUTPUT
outputs:
bazel-version: ${{ steps.bazel-version.outputs.res }}
config: ${{ steps.config.outputs.res }}
os: ${{ steps.os.outputs.res }}
test:
runs-on: ${{ matrix.os }}-latest
Expand All @@ -60,7 +59,6 @@ jobs:
bazel-version: ${{ fromJSON(needs.matrix-prep.outputs.bazel-version) }}
bzlmod: [1, 0]
os: ${{ fromJSON(needs.matrix-prep.outputs.os) }}
config: ${{ fromJSON(needs.matrix-prep.outputs.config) }}
folder:
- "."
- "e2e/copy_action"
Expand Down Expand Up @@ -131,7 +129,6 @@ jobs:
--bazelrc=${GITHUB_WORKSPACE//\\/\/}/.aspect/bazelrc/ci.bazelrc \
--bazelrc=${GITHUB_WORKSPACE//\\/\/}/.github/workflows/ci.bazelrc \
test \
--config=${{ matrix.config }} \
--test_tag_filters=-skip-on-bazel${{ matrix.bazel-version.major }} \
--build_tag_filters=-skip-on-bazel${{ matrix.bazel-version.major }} \
--enable_bzlmod=${{ matrix.bzlmod }} \
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# How to Contribute
# How to contribute

## Formatting

Starlark files should be formatted by buildifier.
Starlark files should be formatted by Buildifier.
We suggest using a pre-commit hook to automate this.
First [install pre-commit](https://pre-commit.com/#installation) (>= v3.2.0),
then run
Expand Down
6 changes: 3 additions & 3 deletions lib/tests/run_binary_expansions/expansions.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -o errexit -o nounset -o pipefail

mkdir -p $(dirname $1)
mkdir -p $(dirname "$1")
outfile=$1
rm -f $outfile
rm -f "$outfile"
for each in $@; do
sanitized=${each/darwin/PLATFORM}
sanitized=${sanitized/k8/PLATFORM}
sanitized=${sanitized/_arm64/}
echo $sanitized >>$outfile
echo "$sanitized" >>"$outfile"
done
4 changes: 2 additions & 2 deletions lib/tests/stamping/stamper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -o nounset
# is another option, which requires Bash 4 for associative arrays.
while IFS= read -r line; do
read key value <<<"$line"
declare $key="$value"
declare "$key"="$value"
done < <(cat "${BAZEL_STABLE_STATUS_FILE:-/dev/null}" "${BAZEL_VOLATILE_STATUS_FILE:-/dev/null}")

# A real program would do something useful with the stamp info, like pass it to a linker.
echo "${BUILD_USER:-unstamped}" >$1
echo "${BUILD_USER:-unstamped}" >"$1"
4 changes: 2 additions & 2 deletions tools/release/copy_release_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ -z "${DEST:-}" ]]; then
exit 1
fi

cd $BUILD_WORKSPACE_DIRECTORY
cd "$BUILD_WORKSPACE_DIRECTORY"
for arg in "$@"; do
cp -pv "$(rlocation $arg)" $DEST
cp -pv "$(rlocation "$arg")" "$DEST"
done

0 comments on commit d2c1ae0

Please sign in to comment.