alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'chad-ux-updates' into 'master'

Browse Source 
changing url in install script

See merge request !26
This commit is contained in:
James Jeffrey
2017-05-30 11:32:30 -07:00
parent 2224aa823a 065c5fef68
commit 22dff9b45e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fn/install.sh
View File

@@ -54,7 +54,7 @@ else
exit 1 exit 1
fi fi
url='https://gitlab.oracledx.com/odx/functions/fn/releases/download' url='https://gitlab-odx.oracle.com/odx/functions/fn/releases/download'
# perform some very rudimentary platform detection # perform some very rudimentary platform detection
case "$(uname)" in case "$(uname)" in
@@ -84,7 +84,7 @@ cat >&2 <<'EOF'
installer script (yet - PRs welcome! [fn/install]). installer script (yet - PRs welcome! [fn/install]).
Please visit the following URL for more detailed installation instructions: Please visit the following URL for more detailed installation instructions:
https://gitlab.oracledx.com/odx/functions https://gitlab-odx.oracle.com/odx/functions
EOF EOF
exit 1 exit 1

4
fn/release.sh
View File

@@ -22,7 +22,7 @@ version=$1
# For GitLab # For GitLab
# 1) Upload files: https://docs.gitlab.com/ee/api/projects.html#upload-a-file # 1) Upload files: https://docs.gitlab.com/ee/api/projects.html#upload-a-file
upload_url='https://gitlab.oracledx.com/api/v3/projects/9/uploads' upload_url='https://gitlab-odx.oracle.com/api/v3/projects/9/uploads'
output=$(curl --request POST --form "file=@fn_linux" --header "PRIVATE-TOKEN: $GITLAB_TOKEN" $upload_url) output=$(curl --request POST --form "file=@fn_linux" --header "PRIVATE-TOKEN: $GITLAB_TOKEN" $upload_url)
linux_markdown=$(echo "$output" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["markdown"]') linux_markdown=$(echo "$output" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["markdown"]')
output=$(curl --request POST --form "file=@fn_mac" --header "PRIVATE-TOKEN: $GITLAB_TOKEN" $upload_url) output=$(curl --request POST --form "file=@fn_mac" --header "PRIVATE-TOKEN: $GITLAB_TOKEN" $upload_url)
@@ -31,7 +31,7 @@ output=$(curl --request POST --form "file=@fn.exe" --header "PRIVATE-TOKEN: $GIT
win_markdown=$(echo "$output" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["markdown"]') win_markdown=$(echo "$output" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["markdown"]')
# 2) Create a release: https://docs.gitlab.com/ee/api/tags.html#create-a-new-release # 2) Create a release: https://docs.gitlab.com/ee/api/tags.html#create-a-new-release
release_url="https://gitlab.oracledx.com/api/v3/projects/9/repository/tags/$version/release" release_url="https://gitlab-odx.oracle.com/api/v3/projects/9/repository/tags/$version/release"
release_desc="Amazing release. Wow\n\nfn for Linux: $linux_markdown \n\nfn for Mac: $mac_markdown \n\nfn for Windows: $win_markdown" release_desc="Amazing release. Wow\n\nfn for Linux: $linux_markdown \n\nfn for Mac: $mac_markdown \n\nfn for Windows: $win_markdown"
curl --request POST -H "PRIVATE-TOKEN: $GITLAB_TOKEN" -H "Content-Type: application/json" -d "{\"tag_name\": \"$version\", \"description\": \"$release_desc\"}" $release_url curl --request POST -H "PRIVATE-TOKEN: $GITLAB_TOKEN" -H "Content-Type: application/json" -d "{\"tag_name\": \"$version\", \"description\": \"$release_desc\"}" $release_url