Merge pull request #9 from AvaPL/version-detection-fix

Changed version detection method, slightly improved output logs.
AvaPL · May 3, 2021 · 973ef1a · 973ef1a
2 parents 18235ae + d885f41
commit 973ef1a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/testdata/.scalafmt.conf b/.github/testdata/.scalafmt.conf
@@ -1 +1 @@
-version = 2.7.2
+version = 3.0.0-RC1
diff --git a/action.yml b/action.yml
@@ -18,7 +18,10 @@ runs:
   steps:
     - run: |
         curl https://raw.githubusercontent.com/scalameta/scalafmt/master/bin/install-scalafmt-native.sh | \
-        sudo bash -s -- $(${{ github.action_path }}/version.sh ${{ inputs.conf-path }}) /usr/local/bin/scalafmt-native
+        sudo bash -s -- $(grep "version" ${{ inputs.conf-path }} | sed -E "s/version|=|\s*//g") /usr/local/bin/scalafmt-native
+        echo "=============================================================================="
+        echo "Config:"
+        cat ${{ inputs.conf-path }}
         echo "=============================================================================="
         echo "scalafmt-native -c ${{ inputs.conf-path }} ${{ inputs.args }}"
         scalafmt-native -c ${{ inputs.conf-path }} ${{ inputs.args }}

diff --git a/version.sh b/version.sh