From 5f9411e3b08be6120e42cce436002669fcdf3d65 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 25 Nov 2024 14:33:24 -0500 Subject: [PATCH 1/3] Make test security github action also support AL2 on node20 Signed-off-by: Peter Zhu --- .github/workflows/test_security.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml index fbbf159ae..a42658447 100644 --- a/.github/workflows/test_security.yml +++ b/.github/workflows/test_security.yml @@ -6,12 +6,11 @@ on: branches: - "*" - "feature/**" - pull_request: + pull_request_target: + types: [opened, synchronize, reopened] branches: - "*" - "feature/**" -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: Get-CI-Image-Tag: @@ -32,17 +31,18 @@ jobs: # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: - name: Checkout neural-search - uses: actions/checkout@v1 + uses: actions/checkout@v4 with: submodules: true - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Run tests From 627d4c88379d903606994651434d90ad75d99a55 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 25 Nov 2024 14:33:45 -0500 Subject: [PATCH 2/3] Make test security github action also support AL2 on node20 Signed-off-by: Peter Zhu --- .github/workflows/test_security.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml index a42658447..9969c9f61 100644 --- a/.github/workflows/test_security.yml +++ b/.github/workflows/test_security.yml @@ -6,8 +6,7 @@ on: branches: - "*" - "feature/**" - pull_request_target: - types: [opened, synchronize, reopened] + pull_request: branches: - "*" - "feature/**" From 09b3dcbd076974819da98f5c3d3333bc5f362b47 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 25 Nov 2024 14:56:41 -0500 Subject: [PATCH 3/3] Make test security github action also support AL2 on node20 Signed-off-by: Peter Zhu --- .github/workflows/test_aggregations.yml | 18 ++++++++++-------- .github/workflows/test_security.yml | 3 +++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_aggregations.yml b/.github/workflows/test_aggregations.yml index 109dc369f..53da514ff 100644 --- a/.github/workflows/test_aggregations.yml +++ b/.github/workflows/test_aggregations.yml @@ -10,9 +10,6 @@ on: branches: - "*" - "feature/**" -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - jobs: Get-CI-Image-Tag: uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main @@ -33,16 +30,20 @@ jobs: # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} + - name: Checkout neural-search - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Run tests @@ -61,11 +62,12 @@ jobs: steps: - name: Checkout neural-search - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Run tests diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml index 9969c9f61..63506b2f4 100644 --- a/.github/workflows/test_security.yml +++ b/.github/workflows/test_security.yml @@ -33,6 +33,9 @@ jobs: options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} + - name: Checkout neural-search uses: actions/checkout@v4 with: