Add WORKING_DIRECTORY environment variable

norio-nomura · Nov 11, 2020 · 01a1495 · 01a1495
1 parent f3d1a1d
commit 01a1495
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -61,3 +61,8 @@ jobs:
         run: diff <(docker run -v $(pwd):$(pwd) -w $(pwd) --rm action-swiftlint|sort) expected.txt
         working-directory: ./test/Warnings
         shell: bash
+
+      - name: Output on Warnings with WORKING_DIRECTORY environment variable
+        run: diff <(docker run -v $(pwd):$(pwd) -w $(pwd) --rm --env WORKING_DIRECTORY=Warnings action-swiftlint|sort) Warnings/expected.txt
+        working-directory: ./test
+        shell: bash
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM norionomura/swiftlint:swift-5.1
 LABEL version="3.1.0"
-LABEL repository="https://github.com/norio-nomura/action-swiftlint"
-LABEL homepage="https://github.com/norio-nomura/action-swiftlint"
+LABEL repository="https://github.com/m-herold/action-swiftlint"
+LABEL homepage="https://github.com/m-herold/action-swiftlint"
 LABEL maintainer="Norio Nomura <norio.nomura@gmail.com>"
 
 LABEL "com.github.actions.name"="GitHub Action for SwiftLint"

diff --git a/README.md b/README.md
@@ -31,6 +31,10 @@ jobs:
         uses: norio-nomura/action-swiftlint@3.1.0
         env:
           DIFF_BASE: ${{ github.base_ref }}
+      - name: GitHub Action for SwiftLint (Different working directory)
+        uses: norio-nomura/action-swiftlint@3.1.0
+        env:
+          WORKING_DIRECTORY: Source
 ```
 
 ## Secrets

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -11,9 +11,14 @@ function convertToGitHubActionsLoggingCommands() {
     sed -E 's/^(.*):([0-9]+):([0-9]+): (warning|error|[^:]+): (.*)/::\4 file=\1,line=\2,col=\3::\5/'
 }
 
+if ! ${WORKING_DIRECTORY+false};
+then
+	cd ${WORKING_DIRECTORY}
+fi
+
 if ! ${DIFF_BASE+false};
 then
-	changedFiles=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD $DIFF_BASE) -- '*.swift')
+	changedFiles=$(git --no-pager diff --name-only --relative FETCH_HEAD $(git merge-base FETCH_HEAD $DIFF_BASE) -- '*.swift')
 
 	if [ -z "$changedFiles" ]
 	then