tiny improve

apache · Nov 20, 2024 · 8ac3f8d · 8ac3f8d
1 parent 7f4fe2b
commit 8ac3f8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,8 +16,11 @@ jobs:
     env:
       USE_STAGE: 'true' # Whether to include the stage repository.
       TRAVIS_DIR: computer-dist/src/assembly/travis
-      KUBERNETES_VERSION: 1.20.1
       BSP_ETCD_URL: http://localhost:2579
+      KUBERNETES_VERSION: 1.20.1
+      # TODO: adapt the HugeGraph Server/Loader version to 1.5.0 (EdgeID has 5 parts now)
+      # NOTE: Remember to adaptor/update the version before new release
+      GRAPH_ENV_VERSION: 1.3.0
 
     steps:
       - name: Checkout
@@ -76,7 +79,7 @@ jobs:
       - name: Prepare env and service
         run: |
           $TRAVIS_DIR/install-env.sh
-          $TRAVIS_DIR/load-data-into-hugegraph.sh
+          $TRAVIS_DIR/load-data-into-hugegraph.sh ${{ env.GRAPH_ENV_VERSION }}
 
       - name: Install JDK 11
         uses: actions/setup-java@v3

diff --git a/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh b/computer/computer-dist/src/assembly/travis/load-data-into-hugegraph.sh
@@ -23,14 +23,14 @@ DATASET_DIR=${TRAVIS_DIR}/../dataset
 
 docker network create ci
 # Note: we need wait for server start finished, so start it first
-docker run -itd --name=graph --network ci -p 8080:8080 hugegraph/hugegraph:1.3.0 && sleep 6
+docker run -itd --name=graph --network ci -p 8080:8080 hugegraph/hugegraph:"${GRAPH_ENV_VERSION}" && sleep 6
 
 wget http://files.grouplens.org/datasets/movielens/ml-latest-small.zip
-unzip -d ${DATASET_DIR} ml-latest-small.zip
+unzip -d "${DATASET_DIR}" ml-latest-small.zip
 
-cd ${DATASET_DIR}/.. && pwd && ls -lh *
+cd "${DATASET_DIR}"/.. && pwd && ls -lh ./*
 
-docker run -id --name=loader --network ci hugegraph/loader:1.3.0
+docker run -id --name=loader --network ci hugegraph/loader:"${GRAPH_ENV_VERSION}"
 docker cp dataset loader:/dataset || exit 1
 
 docker exec -i loader ls -lh /dataset