This commit is contained in:
John Bintz 2022-05-31 23:07:07 -04:00
parent 11c2dc1f52
commit 968367c434
5 changed files with 38 additions and 15 deletions

View File

@ -1 +1 @@
0.99.1~2022-05-25 0.100.0~2022-05-31

View File

@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Hugo"), appTitle = (defaultText = "Hugo"),
appVersion = 39, # Increment this for every release. appVersion = 44, # Increment this for every release.
appMarketingVersion = (defaultText = (embed "app-marketing-version")), appMarketingVersion = (defaultText = (embed "app-marketing-version")),
# Human-readable representation of appVersion. Should match the way you # Human-readable representation of appVersion. Should match the way you

View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
build_only=$1
cd .sandstorm cd .sandstorm
vagrant destroy -f vagrant destroy -f
cd .. cd ..
@ -11,8 +13,16 @@ vagrant-spk vm up
vagrant-spk vm halt vagrant-spk vm halt
vagrant-spk vm up vagrant-spk vm up
xdg-open http://local.sandstorm.io:6090/ if [[ $build_only == "--build-only" ]]; then
vagrant-spk dev echo "Building for packing only, no web browser will open!"
vagrant-spk dev & pid=$!
# 5 minutes should be enough time...
sleep 600
kill -INT $pid
else
xdg-open http://local.sandstorm.io:6090/
vagrant-spk dev
fi
echo "If everything went well:" echo "If everything went well:"
echo echo

View File

@ -4,9 +4,10 @@ require 'httparty'
require 'time' require 'time'
version = ARGV[0] version = ARGV[0]
also_pack = ARGV[1]
unless version unless version
puts "Usage: #{$0} <version>" puts "Usage: #{$0} <version> --also-pack"
exit 1 exit 1
end end
@ -16,7 +17,7 @@ verify_url = "https://github.com/gohugoio/hugo/releases/download/v#{version}/hug
response = HTTParty.get(verify_url) response = HTTParty.get(verify_url)
unless response.code >= 200 && response.code < 300 unless response.code >= 200 && response.code < 300
puts "Error verifying release exists!" puts 'Error verifying release exists!'
puts " URL checked: #{verify_url}" puts " URL checked: #{verify_url}"
puts " Response code: #{response.code}" puts " Response code: #{response.code}"
exit 1 exit 1
@ -34,17 +35,29 @@ lines = File.readlines('.sandstorm/sandstorm-pkgdef.capnp')
lines = lines.map do |line| lines = lines.map do |line|
next line unless line['appVersion'] next line unless line['appVersion']
line.gsub(/= ([0-9]+),/) { |m| "= #{$1.to_i + 1}," } line.gsub(/= ([0-9]+),/) { |_m| "= #{Regexp.last_match(1).to_i + 1}," }
end end
File.open('.sandstorm/sandstorm-pkgdef.capnp', 'w') { |fh| fh.print lines.join } File.open('.sandstorm/sandstorm-pkgdef.capnp', 'w') { |fh| fh.print lines.join }
puts <<-TXT if also_pack == '--also-pack'
system 'bin/test_hugo --build-only'
system 'bin/pack_hugo'
Now do this: puts <<~TXT
* bin/test_hugo Now do this:
* Test fresh install
* vagrant-spk pack ../hugo-sandstorm.spk * Test fresh and upgrade install
* Test upgrade install TXT
TXT else
puts <<~TXT
Now do this:
* bin/test_hugo
* Test fresh install
* bin/pack_hugo
* Test upgrade install
TXT
end

View File

@ -1 +1 @@
0.99.1 0.100.0