fix github workflow

Signed-off-by: Zhongnan Su <szhongna@amazon.com>
opensearch-project · Jun 30, 2021 · 7dc9eb1 · 7dc9eb1
1 parent eb12d84
commit 7dc9eb1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml
@@ -8,7 +8,7 @@ on:
 env:
   PLUGIN_NAME: reportsDashboards
   ARTIFACT_NAME: reports-dashboards
-  OPENSEARCH_VERSION: '1.0'
+  OPENSEARCH_BRANCH: '1.0'
   OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: opensearch-project/Opensearch-Dashboards
-          ref: ${{ env.OPENSEARCH_VERSION }}
+          ref: ${{ env.OPENSEARCH_BRANCH }}
           path: dashboards-reports/OpenSearch-Dashboards
 
       - name: Setup Node

diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
@@ -5,7 +5,7 @@ on: [pull_request, push]
 env:
   PLUGIN_NAME: reportsDashboards
   ARTIFACT_NAME: reports-dashboards
-  OPENSEARCH_VERSION: '1.0'
+  OPENSEARCH_BRANCH: '1.0'
   OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
 
 jobs:
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: opensearch-project/Opensearch-Dashboards
-          ref: ${{ env.OPENSEARCH_VERSION }}
+          ref: ${{ env.OPENSEARCH_BRANCH }}
           path: dashboards-reports/OpenSearch-Dashboards
 
       - name: Setup Node

diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
@@ -2,6 +2,9 @@ name: Test and Build Reports Scheduler
 
 on: [push, pull_request]
 
+env:
+  OPENSEARCH_BRANCH: '1.0'
+  OPENSEARCH_VERSION: '1.0.0'
 
 jobs:
   build:
@@ -19,7 +22,7 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: '1.0'
+          ref: ${{ env.OPENSEARCH_BRANCH }}
       - name: Build OpenSearch
         working-directory: ./OpenSearch
         run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
@@ -29,22 +32,22 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/common-utils'
-          ref: 'main'
+          ref: ${{ env.OPENSEARCH_BRANCH }}
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       # dependencies: job-scheduler
       - name: Checkout job-scheduler
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/job-scheduler'
-          ref: 'main'
+          ref: ${{ env.OPENSEARCH_BRANCH }}
           path: job-scheduler
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -Dbuild.snapshot=false
 
       # reports-scheduler
       - name: Checkout Reports Scheduler
@@ -53,7 +56,7 @@ jobs:
       - name: Build with Gradle
         run: |
           cd reports-scheduler
-          ./gradlew build -Dopensearch.version=1.0.0
+          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1