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: ae84cf93bd25
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c6836798630
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 21, 2015

  1. Only create sha512 digests.

    brixen committed Dec 21, 2015
    Copy the full SHA
    3a38227 View commit details
  2. Fixed digit regex for GNU egrep.

    [ci skip]
    brixen committed Dec 21, 2015
    Copy the full SHA
    6c68367 View commit details
Showing with 2 additions and 6 deletions.
  1. +0 −2 rakelib/package.rake
  2. +0 −2 rakelib/package.rb
  3. +2 −2 scripts/configuration.sh
2 changes: 0 additions & 2 deletions rakelib/package.rake
Original file line number Diff line number Diff line change
@@ -14,8 +14,6 @@ namespace :package do
prefix = "-s '|^|rubinius-#{rbx_version}/|'"
sh "#{files} | sort | uniq | tar -c #{prefix} -T - -f - | bzip2 > #{archive}"

write_md5_digest_file archive
write_sha1_digest_file archive
write_sha512_digest_file archive
end

2 changes: 0 additions & 2 deletions rakelib/package.rb
Original file line number Diff line number Diff line change
@@ -129,8 +129,6 @@ def build
end

create_archive package_name
write_md5_digest_file package_name
write_sha1_digest_file package_name
write_sha512_digest_file package_name
rescue Object => e
# Some rake versions swallow the backtrace, so we do it explicitly.
4 changes: 2 additions & 2 deletions scripts/configuration.sh
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ function rbx_get_revision {
commit_count=".c$count"
fi

version=$(echo "$describe" | egrep -o '^v\d+\.\d+' | cut -c 2-)
commit_date=$(git show --format="%ci" HEAD | egrep -o '\d+-\d+-\d+')
version=$(echo "$describe" | egrep -o '^v[[:digit:]]+\.[[:digit:]]+' | cut -c 2-)
commit_date=$(git show --format="%ci" HEAD | egrep -o '[[:digit:]]+-[[:digit:]]+-[[:digit:]]+')
commit_hash=$(echo "$describe" | egrep -o '[[:xdigit:]]{8,}$')

echo "$version$commit_count $commit_date $commit_hash"