Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a66e8046272d
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 62eacd6bf5ca
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 24, 2015

  1. Copy the full SHA
    2b16491 View commit details
  2. Update website when deploying.

    brixen committed Dec 24, 2015
    Copy the full SHA
    62eacd6 View commit details
Showing with 63 additions and 13 deletions.
  1. +25 −4 scripts/deploy.sh
  2. +12 −0 scripts/digest.sh
  3. +21 −0 scripts/github.sh
  4. +5 −9 scripts/package.sh
29 changes: 25 additions & 4 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ __dir__="$(cd "$(dirname "$0")" && pwd)"

# shellcheck source=scripts/configuration.sh
source "$__dir__/configuration.sh"
# shellcheck source=scripts/digest.sh
source "$__dir__/digest.sh"
# shellcheck source=scripts/github.sh
source "$__dir__/github.sh"
# shellcheck source=scripts/aws.sh
@@ -25,14 +27,15 @@ function rbx_url_prefix {
}

function rbx_upload_files {
local bucket dest src path url name file_exts index
local bucket dest src path url name index
local -a file_exts

bucket=$1
dest=$2
src=$3
path=${4:-}
url=$(rbx_url_prefix "$bucket")
file_exts=("" ".sha512")
file_exts=("" ".sha1" ".sha512")
index="index.txt"

rbx_s3_download "$url" "$index"
@@ -150,12 +153,30 @@ function rbx_deploy_github_release {
}

function rbx_deploy_website_release {
local os_name
local os_name releases updates version url response

os_name=$1
releases="releases.yml"
updates="updated_$releases"
version=$(rbx_revision_version)
url="https://api.github.com/repos/rubinius/rubinius.github.io/contents/_data/releases.yml"

if [[ $os_name == osx ]]; then
echo rbx_deploy_website_release
response=$(curl "$url")

sha=$(echo "$response" | "$__dir__/json.sh" -b | \
egrep '\["sha"\][[:space:]]\"[^"]+\"' | egrep -o '\"[[:xdigit:]]+\"')

cat > "$updates" <<EOF
- version: $version
date: $(rbx_revision_date)
EOF

cat "$releases" >> "$updates"

let i=${#sha}

rbx_github_update_file "$updates" "${sha:1:$i-2}" "Version $version" "$url"
fi
}

12 changes: 12 additions & 0 deletions scripts/digest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function rbx_digest_file {
local name digest

name=$1
digest=${2:-"sha512"}

openssl dgst -"$digest" -hex "$name" | cut -d ' ' -f 2 > "$name.$digest"
}

function rbx_base64 {
base64 -i "$1"
}
21 changes: 21 additions & 0 deletions scripts/github.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
__dir__="$(cd "$(dirname "$0")" && pwd)"

# shellcheck source=scripts/digest.sh
source "$__dir__/digest.sh"

function rbx_github_release_url {
echo "https://api.github.com/repos/rubinius/rubinius/releases"
}
@@ -50,3 +53,21 @@ function rbx_github_release_assets {
"$upload_url?name=$src&access_token=$GITHUB_OAUTH_TOKEN"
done
}

function rbx_github_update_file {
local file sha message url content request

file=$1
sha=$2
message=$3
url=$4
content=$(rbx_base64 "$file")

request=$(printf '{
"message": "%s",
"content": "%s",
"sha": "%s"
}' "$message" "$content" "$sha")

curl -X PUT --data "$request" "$url?access_token=$GITHUB_OAUTH_TOKEN"
}
14 changes: 5 additions & 9 deletions scripts/package.sh
Original file line number Diff line number Diff line change
@@ -4,15 +4,8 @@ __dir__="$(cd "$(dirname "$0")" && pwd)"

# shellcheck source=scripts/configuration.sh
source "$__dir__/configuration.sh"

function rbx_digest_file {
local name digest

name=$1
digest=${2:-"sha512"}

openssl dgst -"$digest" -hex "$name" | cut -d ' ' -f 2 > "$name.$digest"
}
# shellcheck source=scripts/digest.sh
source "$__dir__/digest.sh"

function rbx_package_tar {
local archive files
@@ -34,7 +27,10 @@ function rbx_package_binary {

function rbx_package_homebrew {
echo "Packaging for Homebrew..."

rake package:homebrew

rbx_digest_file "$(rbx_release_name)" "sha1"
}

if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then