Skip to content

Commit 6ae268f

Browse files
Fix 2.x github checks (#171)
Signed-off-by: David Zane <davizane@amazon.com> (cherry picked from commit 9730e66) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 105e912 commit 6ae268f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
2828
# this image tag is subject to change as more dependencies and updates will arrive over time
2929
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
30-
# need to switch to root so that github actions can install runner binary on container without permission issues.
31-
options: --user root
32-
30+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
3331
steps:
32+
- name: Run start commands
33+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
3434
# This step uses the checkout Github action: https://github.com/actions/checkout
3535
- name: Checkout Branch
36-
uses: actions/checkout@v2
36+
uses: actions/checkout@v4
3737

3838
# This step uses the setup-java Github action: https://github.com/actions/setup-java
3939
- name: Setup Java ${{ matrix.java }}
@@ -92,7 +92,7 @@ jobs:
9292

9393
steps:
9494
- name: Checkout Branch
95-
uses: actions/checkout@v2
95+
uses: actions/checkout@v4
9696

9797
# This is a hack, but this step creates a link to the X: mounted drive, which makes the path
9898
# short enough to work on Windows

.github/workflows/integ-tests-with-security.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ jobs:
2828
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
2929
# this image tag is subject to change as more dependencies and updates will arrive over time
3030
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
31-
# need to switch to root so that github actions can install runner binary on container without permission issues.
32-
options: --user root
31+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
3332

3433
steps:
35-
- uses: actions/checkout@v3
34+
- name: Run start commands
35+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
36+
37+
- uses: actions/checkout@v4
3638

3739
- name: Set up JDK ${{ matrix.java }}
3840
uses: actions/setup-java@v3
@@ -66,7 +68,7 @@ jobs:
6668
runs-on: ${{ matrix.os }}
6769

6870
steps:
69-
- uses: actions/checkout@v3
71+
- uses: actions/checkout@v4
7072

7173
- name: Set up JDK ${{ matrix.java }}
7274
uses: actions/setup-java@v3

0 commit comments

Comments
 (0)