Skip to content

Commit 99c1ff5

Browse files
committedDec 18, 2015
Moved release, package tar to Bash.
1 parent c36d538 commit 99c1ff5

File tree

4 files changed

+47
-8
lines changed

4 files changed

+47
-8
lines changed
 

‎scripts/configuration.sh

+6
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,9 @@ function rbx_revision_date {
4747
function rbx_revision_hash {
4848
rbx_get_revision | cut -d ' ' -f 3
4949
}
50+
51+
function rbx_write_revision_file {
52+
if [[ -d $(rbx_git_directory) ]]; then
53+
rbx_get_revision > "$(rbx_revision_file)"
54+
fi
55+
}

‎scripts/deploy.sh

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

3-
source "scripts/io.sh"
4-
source "scripts/aws.sh"
53
source "scripts/configuration.sh"
4+
source "scripts/aws.sh"
5+
source "scripts/io.sh"
66

77
function rbx_url_prefix {
88
local bucket=$1
@@ -49,10 +49,10 @@ function rbx_upload_files {
4949
if [[ $TRAVIS_OS_NAME == osx && $CC == gcc && $RVM == "rbx-2" ]]; then
5050
echo "Deploying release tarball $(rbx_revision_version)..."
5151

52-
rake release || fail "unable to build release tarball"
52+
./scripts/release || fail "unable to build release tarball"
5353

5454
bucket="rubinius-releases-rubinius-com"
55-
release_name="rubinius-$(rbx_revision_version).tar.bz2"
55+
release_name="$(rbx_release_name)"
5656

5757
rbx_upload_files "$bucket" "$release_name" "$release_name"
5858
fi
@@ -64,8 +64,6 @@ if [[ $RVM == "rbx-2" ]]; then
6464
rake package:binary || fail "unable to build binary"
6565

6666
bucket="rubinius-binaries-rubinius-com"
67-
revision_version=$(rbx_revision_version)
68-
release_name="rubinius-$revision_version.tar.bz2"
6967

7068
declare -a paths os_releases versions
7169

@@ -81,7 +79,7 @@ if [[ $RVM == "rbx-2" ]]; then
8179
done
8280
fi
8381

84-
IFS="." read -r -a array <<< "$revision_version"
82+
IFS="." read -r -a array <<< "$(rbx_revision_version)"
8583

8684
let i=0
8785
version=""
@@ -95,7 +93,7 @@ if [[ $RVM == "rbx-2" ]]; then
9593

9694
for path in "${paths[@]}"; do
9795
for version in "${versions[@]}"; do
98-
rbx_upload_files "$bucket" "rubinius$version.tar.bz2" "$release_name" "$path"
96+
rbx_upload_files "$bucket" "rubinius$version.tar.bz2" "$(rbx_release_name)" "$path"
9997
done
10098
done
10199
fi

‎scripts/package.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
function rbx_digest_file {
2+
local name digest
3+
4+
name=$1
5+
digest=${2:-"sha512"}
6+
7+
openssl dgst -"$digest" -hex "$name" | cut -d ' ' -f 2 > "$name.$digest"
8+
}
9+
10+
function rbx_package_tar {
11+
local archive files prefix
12+
13+
archive="$(rbx_release_name)"
14+
rm -rf "$archive"
15+
16+
files="$(git ls-files; ls .revision; ls vendor/cache/*.gem)"
17+
18+
echo "$files" | sort | uniq | \
19+
tar -c -s "|^|rubinius-$(rbx_revision_version)/|" -T - -f - | bzip2 > "$archive"
20+
21+
rbx_digest_file "$archive" "sha512"
22+
}

‎scripts/release.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
source "scripts/configuration.sh"
4+
source "scripts/package.sh"
5+
6+
function rbx_release_name {
7+
echo "rubinius-$(rbx_revision_version).tar.bz2"
8+
}
9+
10+
rbx_write_revision_file
11+
rbx_package_tar
12+
13+
exit 1

0 commit comments

Comments
 (0)
Please sign in to comment.