Merge pull request #1 from hetao92/hetao-dev

feat: update oss path
vesoft-inc · Aug 23, 2021 · 9e2a120 · 9e2a120
2 parents e03a409 + dd59f47
commit 9e2a120
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/studio-rpm-package.yml b/.github/workflows/studio-rpm-package.yml
@@ -35,6 +35,6 @@ jobs:
       - name: Package
         run: bash ./source/nebula-graph-studio/scripts/rpm-package.sh ${{ secrets.GA_ID }}
       - name: Upload oss
-        run: cd ./source/nebula-graph-studio/tmp/ && ossutil64 -e ${{ secrets.OSS_ENDPOINT }} -i ${{ secrets.OSS_ID }} -k ${{ secrets.OSS_SECRET }} -f cp ./  ${{ secrets.OSS_URL }} --include "nebula-graph-studio-*.rpm*" --only-current-dir -r
+        run: bash ./source/nebula-graph-studio/scripts/rpm-upload.sh ${{ secrets.OSS_ENDPOINT }} ${{ secrets.OSS_ID }} ${{ secrets.OSS_SECRET }} ${{ secrets.OSS_URL }}
 
 
diff --git a/.github/workflows/studio-tar-package.yml b/.github/workflows/studio-tar-package.yml
@@ -37,6 +37,6 @@ jobs:
       - name: Package
         run: bash ./source/nebula-graph-studio/scripts/tar-package.sh ${{ secrets.GA_ID }}
       - name: Upload to OSS
-        run: ls -a & ossutil64 -e ${{ secrets.OSS_ENDPOINT }} -i ${{ secrets.OSS_ID }} -k ${{ secrets.OSS_SECRET }} -f cp ./  ${{ secrets.OSS_URL }} --include "nebula-graph-studio-*.tar.gz" --only-current-dir -r
+        run: bash ./source/nebula-graph-studio/scripts/tar-upload.sh ${{ secrets.OSS_ENDPOINT }} ${{ secrets.OSS_ID }} ${{ secrets.OSS_SECRET }} ${{ secrets.OSS_URL }}
 
 
diff --git a/scripts/rpm-upload.sh b/scripts/rpm-upload.sh
@@ -0,0 +1,8 @@
+set -ex
+
+DIR=`pwd`
+STUDIO=$DIR/source/nebula-graph-studio
+cd $STUDIO
+VERSION=`cat package.json | grep '"version":' | awk 'NR==1{print $2}' | awk -F'"' '{print $2}'`
+cd $STUDIO/tmp/
+ossutil64 -e $1 -i $2 -k $3 -f cp ./  $4${VERSION} --include "nebula-graph-studio-*.rpm*" --only-current-dir -r
diff --git a/scripts/tar-upload.sh b/scripts/tar-upload.sh
@@ -0,0 +1,8 @@
+set -ex
+
+DIR=`pwd`
+STUDIO=$DIR/source/nebula-graph-studio
+cd $STUDIO
+VERSION=`cat package.json | grep '"version":' | awk 'NR==1{print $2}' | awk -F'"' '{print $2}'`
+cd $DIR
+ossutil64 -e $1 -i $2 -k $3 -f cp ./  $4${VERSION} --include "nebula-graph-studio-*.tar.gz" --only-current-dir -r