Skip to content

Commit

Permalink
Merge branch 'main' into update-release-pr-action
Browse files Browse the repository at this point in the history
  • Loading branch information
pietern authored Jun 6, 2024
2 parents e3a8595 + b81a555 commit f359ec8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: ./setup-cli

Expand All @@ -46,7 +46,7 @@ jobs:
- windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: ./setup-cli

Expand All @@ -72,7 +72,7 @@ jobs:
- windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: ./setup-cli

Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: ./setup-cli

Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
- windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: ./setup-cli

Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: ./setup-cli

Expand Down
4 changes: 2 additions & 2 deletions setup_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fi

# Pull latest version from VERSION file if not set.
if [ -z "${VERSION:-}" ]; then
VERSION=$(cat $(dirname $0)/VERSION)
VERSION=$(cat $(dirname "$0")/VERSION)
fi

FILE="databricks_cli_$VERSION"
Expand Down Expand Up @@ -52,4 +52,4 @@ unzip -q "${FILE}.zip" -d .bin
# Add databricks to path.
dir=$PWD/.bin
chmod +x "${dir}/databricks"
echo "$dir" >> $GITHUB_PATH
echo "$dir" >> "$GITHUB_PATH"
8 changes: 4 additions & 4 deletions setup_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ macOS)
;;
esac

gh run download $last_successful_run_id -n $artifact -D .bin
gh run download "$last_successful_run_id" -n "$artifact" -D .bin

dir="$PWD/.bin/$(cli_snapshot_directory)"

Expand All @@ -82,11 +82,11 @@ fi

if [ "$RUNNER_OS" == "Windows" ]; then
(
cd $dir
cd "$dir"
mv ./databricks.exe ./databricks
)
fi

# Add databricks to path.
chmod +x $dir/databricks
echo "$dir" >> $GITHUB_PATH
chmod +x "$dir/databricks"
echo "$dir" >> "$GITHUB_PATH"

0 comments on commit f359ec8

Please sign in to comment.