Merge branch 'adoptium:master' into master

LinHu2016 · Sep 20, 2024 · 168f12d · 168f12d
2 parents 6a90b8b + 277f44f
commit 168f12d
Show file tree

Hide file tree

Showing 281 changed files with 546,515 additions and 7,147 deletions.
diff --git a/.github/workflows/autoTestPR.yml b/.github/workflows/autoTestPR.yml
@@ -2,13 +2,16 @@ name: "Auto test PR"
 on:
   issue_comment:
     types: [created]
+permissions:
+      contents: write
+      issues: write
 jobs:
   autoTestPR:
     runs-on: ubuntu-latest
     if: startsWith(github.event.comment.body, 'auto exclude test')
     steps:
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: 3.8
       - name: check python version
@@ -18,11 +21,11 @@ jobs:
         run: |
           pip install lxml
       - name: checkout current repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: 'tests'
       - name: checkout TKG repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           repository: 'adoptium/TKG.git'
           ref: 'master'
@@ -38,7 +41,7 @@ jobs:
         run: |
           curl -u github-actions:${{ secrets.GITHUB_TOKEN }} -d '{ "body":  "The specified test cannot be excluded. Action run: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" }' -X POST ${{ github.event.issue.comments_url }}
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with:
           path: 'tests'
           title: '${{ github.event.comment.body }}'
@@ -53,4 +56,4 @@ jobs:
           signoff: 'true'
       - name: add label
         run: |
-          curl -u github-actions:${{ secrets.GITHUB_TOKEN }} -d '{"labels":["test excluded"]}' -X POST ${{ github.event.issue.url }}/labels
+          curl -u github-actions:${{ secrets.GITHUB_TOKEN }} -d '{"labels":["test excluded"]}' -X POST ${{ github.event.issue.url }}/labels
diff --git a/.github/workflows/directoriesFilesChangePR.yml b/.github/workflows/directoriesFilesChangePR.yml
@@ -1,7 +1,6 @@
 name: 'Directories/Files Change Test PR'
 on:
-  pull_request:
-    types: [ready_for_review]
+  workflow_dispatch:
     paths-ignore:
       - '.gitignore'
       - '*.md'
@@ -15,7 +14,7 @@ jobs:
     outputs:
       buildLists: ${{ steps.locations_parse.outputs.build_lists }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: jitterbit/get-changed-files@v1
         id: get_change
         continue-on-error: true
@@ -38,7 +37,7 @@ jobs:
         build_list: ${{ fromJson(needs.getBuildLists.outputs.buildLists) }}
         impl: [hotspot, openj9]
     steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: AdoptOpenJDK/install-jdk@v1
         with:
           version: ${{ matrix.version }}
@@ -52,7 +51,7 @@ jobs:
           jdksource: 'install-jdk'
           version: ${{ matrix.version }}
           openjdk_testRepo: '${{ github.event.pull_request.head.repo.full_name }}:${{ github.head_ref }}'
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: failure()
         with:
           name: output_changed_based_build_list

diff --git a/.github/workflows/disabledTestsLinter.yml b/.github/workflows/disabledTestsLinter.yml
@@ -0,0 +1,24 @@
+name: 'Disabled Tests Linter'
+on:
+  pull_request:
+    paths:
+    - 'openjdk/excludes/*'
+    - '**/playlist.xml'
+
+jobs:
+  disableTestsLinter:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install python3 python3-lxml
+
+      - name: Run exclude_parser.py on ProblemList files
+        run: find ./openjdk/excludes -name "ProblemList*" | python3 ./scripts/disabled_tests/exclude_parser.py -v > /dev/null
+
+      - name: Run playlist_parser.py on playlist.xml files
+        run: find . -name "playlist.xml" | python3 ./scripts/disabled_tests/playlist_parser.py -v > /dev/null
diff --git a/.github/workflows/parse-issues.yml b/.github/workflows/parse-issues.yml
@@ -15,11 +15,11 @@ jobs:
       AQA_ISSUE_TRACKER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Set up Python 3.8
-        uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.3.0
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: 3.8
       - name: checkout current repo
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: install reqs
         run: |
           pip install -r scripts/disabled_tests/requirements.txt
@@ -44,7 +44,7 @@ jobs:
           cat all.json | python scripts/disabled_tests/issue_status.py -v > output.json
           echo "::endgroup::"
       - name: store artifact
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: disabled_tests
           path: output.json

diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml
@@ -2,6 +2,9 @@ name: "PR Comment Build Action for aqa-tests"
 on:
   issue_comment:
     types: [created]
+permissions:
+      contents: write
+      issues: write
 jobs:
   parseComment:
     runs-on: ubuntu-latest
@@ -19,12 +22,12 @@ jobs:
       id: workflow_run_info
     # Checkout current repo to access the repo-specific config file `.github/workflows/runAqaConfig.json`
     - name: Checkout current repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         path: 'main'
     # Checkout the main TKG repo to access the shared script `scripts/testRepo/runAqaArgParse.py`
     - name: Checkout main TKG repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         repository: 'adoptium/TKG.git'
         ref: 'master'
@@ -47,7 +50,7 @@ jobs:
       id: output_log
     - name: Create error comment
       if: failure()
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -69,7 +72,7 @@ jobs:
       run: echo ::set-output name=failed::true
       id: failure_report
     - name: Create success comment
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -129,7 +132,7 @@ jobs:
         sourceType: 'url'
         impl: ${{ matrix.jdk_impl }}
     # get-pr step by @Simran-B https://github.com/actions/checkout/issues/331#issuecomment-707103442
-    - uses: actions/github-script@v6
+    - uses: actions/github-script@v7
       id: get-pr
       with:
         script: |
@@ -154,7 +157,7 @@ jobs:
          version: ${{ matrix.jdk_version }}
          openjdk_testRepo: '${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}:${{ fromJSON(steps.get-pr.outputs.result).head.ref }}'
          tkg_Repo: ${{ matrix.tkg_repo }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       if: failure()
       with:
         name: test_output
@@ -166,7 +169,7 @@ jobs:
     if: failure() && !needs.parseComment.outputs.failed
     steps:
     - name: Create comment
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -187,7 +190,7 @@ jobs:
     if: cancelled()
     steps:
     - name: Create comment
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -208,7 +211,7 @@ jobs:
     if: success()
     steps:
     - name: Create comment
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |

diff --git a/.github/workflows/semgrep_diff.yml b/.github/workflows/semgrep_diff.yml
@@ -0,0 +1,25 @@
+# ********************************************************************************
+# Copyright (c) 2024 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made
+# available under the terms of the Apache Software License 2.0
+# which is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************
+
+---
+name: Semgrep Differential Scan
+on:
+  pull_request:
+
+permissions:
+  contents: read
+  statuses: write
+
+jobs:
+  semgrep-diff:
+    uses: adoptium/.github/.github/workflows/semgrep_diff.yml@main
diff --git a/.gitignore b/.gitignore
@@ -11,11 +11,12 @@ autoGen.mk
 TestConfig
 TKG
 functional
+!functional/MBCS_Tests
+!functional/OpenJcePlusTests
 !functional/security
 !functional/security/AQAvit
 !functional/security/Crypto
 !functional/SyntheticGCWorkload
-!functional/MBCS_Tests
 
 Utils
 systemtest_prereqs/*