Simply print the Swift extractor dir

github · Dec 16, 2022 · 8531eee · 8531eee
1 parent bf101af
commit 8531eee
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml
diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml
diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml
diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml
diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml
@@ -19,9 +19,9 @@ steps:
     env: 
       CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
     run: |
-      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json)
-      $SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
-      echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
+      echo $("$CODEQL_PATH" resolve languages --format json)
+      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json | jq '.swift.[0]')
+      echo "$SWIFT_EXTRACTOR_DIR"
   - uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
     if: runner.os != 'Windows'
     with:

diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml
@@ -16,10 +16,10 @@ steps:
     env: 
       CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
     run: |
-      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json)
-      $SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
-      echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
-    
+      echo $("$CODEQL_PATH" resolve languages --format json)
+      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json | jq '.swift.[0]')
+      echo "$SWIFT_EXTRACTOR_DIR"
+          
   - uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
     with:
       swift-version: "${{steps.get_swift_version.outputs.version}}"

diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml
@@ -17,9 +17,9 @@ steps:
     env: 
       CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
     run: |
-      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json)
-      $SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
-      echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
+      echo $("$CODEQL_PATH" resolve languages --format json)
+      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json | jq '.swift.[0]')
+      echo "$SWIFT_EXTRACTOR_DIR"
   - uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
     with:
       swift-version: "${{steps.get_swift_version.outputs.version}}"

diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml
@@ -17,9 +17,9 @@ steps:
     env: 
       CODEQL_PATH: ${{steps.init.outputs.codeql-path}}
     run: |
-      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json)
-      $SWIFT_EXTRACTOR_DIR/tools/*/extractor --version | awk '/version/ { print $3 }'
-      echo "version=$VERSION" | tee -a $GITHUB_OUTPUT
+      echo $("$CODEQL_PATH" resolve languages --format json)
+      SWIFT_EXTRACTOR_DIR=$("$CODEQL_PATH" resolve languages --format json | jq '.swift.[0]')
+      echo "$SWIFT_EXTRACTOR_DIR"
   - uses: swift-actions/setup-swift@194625b58a582570f61cc707c3b558086c26b723
     with:
       swift-version: "${{steps.get_swift_version.outputs.version}}"