refactoring (#117)

* refactoring Signed-off-by: Keisuke Shima <[email protected]> * fix Signed-off-by: Keisuke Shima <[email protected]> --------- Signed-off-by: Keisuke Shima <[email protected]>
tier4 · Nov 7, 2023 · 5b97c6d · 5b97c6d
1 parent 0833dcb
commit 5b97c6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/action.yml b/action.yml
@@ -91,14 +91,6 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - name: Filtering input
-      id: filtered
-      run: |
-        echo ::set-output name=ARTIFACTS_DIR::$(echo ${{ inputs.artifacts-dir }} | sed -e "s@/\$@@")
-        echo ::set-output name=HUGO_DIR::$(echo ${{ inputs.hugo-dir }} | sed -e "s@/\$@@")
-        echo ::set-output name=OUTPUT_DIR::$(echo ${{ inputs.output-dir }} | sed -e "s@/\$@@")
-      shell: bash
-
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -118,8 +110,8 @@ runs:
 
     - name: Measure code quality index
       run: |
-        echo "Artifacts directory is ${{ steps.filtered.outputs.ARTIFACTS_DIR }}"
-        mkdir -p ${{ steps.filtered.outputs.ARTIFACTS_DIR }}
+        echo "Artifacts directory is ${{ inputs.artifacts-dir }}"
+        mkdir -p ${{ inputs.artifacts-dir }}
         TIMESTAMP=$(cat ${GITHUB_WORKSPACE}/timestamp.txt)
         CODECHECKER_CONFIG_PATH=${{ inputs.codechecker-config-path }}
         CODECHECKER_SKIP_LIST=${{ inputs.codechecker-skip-list }}
@@ -133,10 +125,10 @@ runs:
         cd ${GITHUB_ACTION_PATH} && python3 -m ros_metrics_reporter.ros_metrics_reporter \
           --base-dir=${{ inputs.target-dir }} \
           --action-dir=${GITHUB_ACTION_PATH} \
-          --output-dir=${{ steps.filtered.outputs.ARTIFACTS_DIR }} \
+          --output-dir=${{ inputs.artifacts-dir }} \
           --timestamp=${TIMESTAMP} \
           --lcovrc=${{ inputs.lcovrc-path }} \
-          --hugo-root-dir=${{ steps.filtered.outputs.HUGO_DIR }} \
+          --hugo-root-dir=${{ inputs.hugo-dir }} \
           --base-url=${{ inputs.base-url }} \
           --title=${{ inputs.title }} \
           --extra-cmake-args=${{ inputs.extra-cmake-args }} \
@@ -156,5 +148,5 @@ runs:
 
     - name: Generate pages
       run: |
-        cd ${{ steps.filtered.outputs.HUGO_DIR }} && hugo -d ${{ steps.filtered.outputs.OUTPUT_DIR }}
+        cd ${{ inputs.hugo-dir }} && hugo -d ${{ inputs.output-dir }}
       shell: bash
diff --git a/ros_metrics_reporter/metrics/lizard_package.py b/ros_metrics_reporter/metrics/lizard_package.py
@@ -57,7 +57,7 @@ def lizard_single_package(
         output_file=(output_package_dir / "index.html"),
     )
 
-    print(f"Generated package metrics: {package_name}")
+    print(f"Generated package metrics: {output_package_dir}")
 
 
 def lizard_package(