Address PR review, clean up comments

github · Aug 2, 2024 · 1f0a037 · 1f0a037
1 parent 762301c
commit 1f0a037
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 26 deletions.
diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml
diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml
diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml
diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml
diff --git a/pr-checks/checks/all-platform-bundle.yml b/pr-checks/checks/all-platform-bundle.yml
@@ -7,7 +7,7 @@ steps:
   - id: init
     uses: ./../action/init
     with:
-      # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
+      # Swift is not supported on Ubuntu so we manually exclude it from the list here
       languages: cpp,csharp,go,java,javascript,python,ruby 
       tools: ${{ steps.prepare-test.outputs.tools-url }}
   - name: Build code

diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml
@@ -7,24 +7,17 @@ steps:
       go-version: ">=1.21.0"
 
   - uses: ./../action/init
-    if: runner.os == 'Linux'
-    with:
-      db-location: "${{ runner.temp }}/customDbLocation"
-      # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
-      languages: cpp,csharp,go,java,javascript,python,ruby 
-      tools: ${{ steps.prepare-test.outputs.tools-url }}
-
-  - uses: ./../action/init
-    id: init-macos
-    if: runner.os == 'macOS'
+    id: init
     with:
       db-location: "${{ runner.temp }}/customDbLocation"
+      # Swift is not supported on Ubuntu so we manually exclude it from the list here
+      languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
       tools: ${{ steps.prepare-test.outputs.tools-url }}
 
   - uses: ./../action/.github/actions/setup-swift
     if: runner.os == 'macOS'
     with:
-      codeql-path: ${{ steps.init-macos.outputs.codeql-path }}
+      codeql-path: ${{ steps.init.outputs.codeql-path }}
 
   - name: Build code
     shell: bash

diff --git a/pr-checks/checks/test-local-codeql.yml b/pr-checks/checks/test-local-codeql.yml
@@ -12,6 +12,7 @@ steps:
   - id: init
     uses: ./../action/init
     with:
+      # Swift is not supported on Ubuntu so we manually exclude it from the list here
       languages: cpp,csharp,go,java,javascript,python,ruby
       tools: ./codeql-bundle-linux64.tar.gz
   - name: Build code

diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml
@@ -7,7 +7,7 @@ steps:
     id: init
     with:
       db-location: ${{ runner.temp }}/customDbLocation
-      # We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
+      # Swift is not supported on Ubuntu so we manually exclude it from the list here
       languages: cpp,csharp,go,java,javascript,python,ruby 
       tools: ${{ steps.prepare-test.outputs.tools-url }}
   - uses: actions/setup-go@v5