Skip to content

Commit 67350d2

Browse files
Update common-utils shadow plugin repo and bump to 3.0.0.0-alpha1 (#775)
* Update common-utils shadow plugin repo and bump to 3.0.0.0-alpha1 Signed-off-by: Peter Zhu <[email protected]> * Update workflow to fix glibc issues Signed-off-by: Peter Zhu <[email protected]> * Update workflow to fix glibc issues Signed-off-by: Peter Zhu <[email protected]> * Update workflow to fix glibc issues Signed-off-by: Peter Zhu <[email protected]> * Update workflow to fix glibc issues Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]>
1 parent cb9d38b commit 67350d2

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
pull_request:
77
branches:
88
- "*"
9-
env:
10-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
119

1210
jobs:
1311
Get-CI-Image-Tag:
@@ -22,23 +20,30 @@ jobs:
2220
java:
2321
- 21
2422
- 23
25-
name: Build and Test
26-
runs-on: ubuntu-latest
23+
os:
24+
- ubuntu-24.04-arm # arm64-preview
25+
- ubuntu-24.04 # x64
26+
name: Build and Test Linux
27+
runs-on: ${{ matrix.os }}
2728
container:
2829
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
2930
# this image tag is subject to change as more dependencies and updates will arrive over time
3031
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
3132
# need to switch to root so that github actions can install runner binary on container without permission issues.
32-
options: --user root
33+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
3334

3435
steps:
36+
- name: Run start commands
37+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
38+
3539
- name: Checkout
36-
uses: actions/checkout@v2
40+
uses: actions/checkout@v4
3741

3842
- name: Setup Java ${{ matrix.java }}
39-
uses: actions/setup-java@v1
43+
uses: actions/setup-java@v4
4044
with:
4145
java-version: ${{ matrix.java }}
46+
distribution: 'temurin'
4247

4348
- name: Build and Test
4449
run: |
@@ -57,17 +62,18 @@ jobs:
5762
java:
5863
- 21
5964
- 23
60-
name: Build and Test
65+
name: Build and Test Windows
6166
runs-on: windows-latest
6267

6368
steps:
6469
- name: Checkout
65-
uses: actions/checkout@v2
70+
uses: actions/checkout@v4
6671

6772
- name: Setup Java ${{ matrix.java }}
68-
uses: actions/setup-java@v1
73+
uses: actions/setup-java@v4
6974
with:
7075
java-version: ${{ matrix.java }}
76+
distribution: 'temurin'
7177

7278
- name: Build and Test
7379
run: |

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
buildscript {
77
ext {
88
opensearch_group = "org.opensearch"
9-
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
9+
opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
1010
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
11-
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
11+
buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
1212
kotlin_version = System.getProperty("kotlin.version", "1.9.25")
1313
}
1414

@@ -58,7 +58,7 @@ apply plugin: 'java'
5858
apply plugin: 'jacoco'
5959
apply plugin: 'signing'
6060
apply plugin: 'maven-publish'
61-
apply plugin: 'com.github.johnrengelman.shadow'
61+
apply plugin: 'com.gradleup.shadow'
6262
// apply plugin: 'io.gitlab.arturbosch.detekt'
6363
apply plugin: 'org.jetbrains.kotlin.jvm'
6464
apply plugin: 'org.jetbrains.kotlin.plugin.allopen'

0 commit comments

Comments
 (0)