diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index ba4d474..f48827a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -6,6 +6,6 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag "reviewdog-ktlint:$(date +%s)" \ No newline at end of file + run: docker build . --file Dockerfile --tag "reviewdog-ktlint:$(date +%s)" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 13701e8..1f89d9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ jobs: name: runner / ktlint (github-check) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./ with: github_token: ${{ secrets.github_token }} @@ -19,7 +19,7 @@ jobs: name: runner / ktlint (github-pr-check) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./ with: github_token: ${{ secrets.github_token }} @@ -32,7 +32,7 @@ jobs: name: runner / ktlint (github-pr-review) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./ with: github_token: ${{ secrets.github_token }} diff --git a/Dockerfile b/Dockerfile index 996808d..9bff1f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14.7 +FROM alpine:3.17.0 ENV REVIEWDOG_VERSION=v0.14.1 diff --git a/entrypoint.sh b/entrypoint.sh index 50941d9..8262f72 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,29 +4,29 @@ export RELATIVE= export ANDROID= export BASELINE= -if [ "$INPUT_KTLINT_VERSION" = "latest" ] ; then - curl -sSL https://api.github.com/repos/pinterest/ktlint/releases/latest \ - | grep "browser_download_url.*ktlint\"" \ - | cut -d : -f 2,3 \ - | tr -d \" \ - | wget -qi -\ - && chmod a+x ktlint \ - && mv ktlint /usr/local/bin/ +if [ "$INPUT_KTLINT_VERSION" = "latest" ]; then + curl -sSL https://api.github.com/repos/pinterest/ktlint/releases/latest --header "authorization: Bearer ${INPUT_GITHUB_TOKEN}" | + grep "browser_download_url.*ktlint\"" | + cut -d : -f 2,3 | + tr -d \" | + wget -qi - && + chmod a+x ktlint && + mv ktlint /usr/local/bin/ else - curl -sSLO https://github.com/pinterest/ktlint/releases/download/"${INPUT_KTLINT_VERSION}"/ktlint \ - && chmod a+x ktlint \ - && mv ktlint /usr/local/bin/ + curl -sSLO https://github.com/pinterest/ktlint/releases/download/"${INPUT_KTLINT_VERSION}"/ktlint && + chmod a+x ktlint && + mv ktlint /usr/local/bin/ fi -if [ "$INPUT_RELATIVE" = true ] ; then +if [ "$INPUT_RELATIVE" = true ]; then export RELATIVE=--relative fi -if [ ! -z "$INPUT_BASELINE" ] ; then +if [ ! -z "$INPUT_BASELINE" ]; then export BASELINE="--baseline=${INPUT_BASELINE}" fi -if [ "$INPUT_ANDROID" = true ] ; then +if [ "$INPUT_ANDROID" = true ]; then export ANDROID=--android fi @@ -38,8 +38,8 @@ export REVIEWDOG_GITHUB_API_TOKEN="${INPUT_GITHUB_TOKEN}" echo ktlint version: "$(ktlint --version)" -ktlint --reporter=checkstyle $RELATIVE $ANDROID $BASELINE $INPUT_FILE_GLOB \ - | reviewdog -f=checkstyle \ +ktlint --reporter=checkstyle $RELATIVE $ANDROID $BASELINE $INPUT_FILE_GLOB | + reviewdog -f=checkstyle \ -name="ktlint" \ -reporter="${INPUT_REPORTER}" \ -level="${INPUT_LEVEL}" \