From af955099123515d5878922e4d0c2541da5662392 Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Sun, 28 May 2017 18:43:31 -0700 Subject: [PATCH 1/2] changing url in install script --- fn/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fn/install.sh b/fn/install.sh index 9003f1f25..338d8730e 100644 --- a/fn/install.sh +++ b/fn/install.sh @@ -54,7 +54,7 @@ else exit 1 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 case "$(uname)" in @@ -84,7 +84,7 @@ cat >&2 <<'EOF' installer script (yet - PRs welcome! [fn/install]). Please visit the following URL for more detailed installation instructions: - https://gitlab.oracledx.com/odx/functions + https://gitlab-odx.oracle.com/odx/functions EOF exit 1 From 065c5fef68bc4e4ec67771ca56a2a866ae1fb847 Mon Sep 17 00:00:00 2001 From: Chad Arimura Date: Mon, 29 May 2017 08:50:41 -0700 Subject: [PATCH 2/2] test webhook to MM, fixing release.sh URL --- fn/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fn/release.sh b/fn/release.sh index 976a64df9..215f7cd03 100755 --- a/fn/release.sh +++ b/fn/release.sh @@ -22,7 +22,7 @@ version=$1 # For GitLab # 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) 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) @@ -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"]') # 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" curl --request POST -H "PRIVATE-TOKEN: $GITLAB_TOKEN" -H "Content-Type: application/json" -d "{\"tag_name\": \"$version\", \"description\": \"$release_desc\"}" $release_url