Merge pull request #232 from OpenLiberty/staging

Merge staging to prod - update test.yml
OpenLiberty · Jun 6, 2024 · 37314cf · 37314cf
2 parents 03a4e7b + 02380c5
commit 37314cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/.github/workflows/add-pr-to-project.yml b/.github/workflows/add-pr-to-project.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,18 +22,18 @@ jobs:
         shell: bash
         run: bash ./tools/pr-checker/checker.sh ${{ github.repository }} ${{ github.event.pull_request.number }} | tee checker.log 
       - id: Lint-Code-Base
-        if: always()
-        uses: github/super-linter@v3.17.0
+        if: "! github.event.pull_request.head.repo.fork"
+        uses: github/super-linter@latest
         env:
           VALIDATE_ALL_CODEBASE: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: ./tools/pr-checker/linters/
           DEFAULT_BRANCH: prod
       - name: Summary
-        if: always()
+        if: "! github.event.pull_request.head.repo.fork"
         run: |
-            cat ./checker.log |  tail -n +2; echo "====== Super Linter ======"
-            cat ./super-linter.log | sed -n '/.*The script has completed.*/,$p' | tail -n +4 | sed  's/.*\(\[[A-Z]\+\]\)/\1/'
+            < ./checker.log tail -n +2; echo "====== Super Linter ======"
+            < ./super-linter.log sed -n '/.*The script has completed.*/,$p' | tail -n +4 | sed  's/.*\(\[[A-Z]\+\]\)/\1/'
             echo "====== Examine logs in Checker and Super-Linter steps for more details ======"
             if [ '${{ steps.Checker.outcome }}' != 'success' ] || [ '${{ steps.Lint-Code-Base.outcome }}' != 'success' ]; then exit 1; fi
   test-app:
@@ -59,7 +59,7 @@ jobs:
         if: always()
         run: |
           logsPath=$(sudo find . -name "console.log");
-          sudo cat $logsPath | sudo grep Launching
+          sudo cat "$logsPath" | sudo grep Launching
 
       - name: Archive server logs if failed
         if: failure()