Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
Release 0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
SeanTAllen committed May 25, 2018
2 parents 6c4de6b + db8131a commit 2af1a62
Show file tree
Hide file tree
Showing 11 changed files with 79 additions and 41 deletions.
3 changes: 1 addition & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ image: Visual Studio 2015

branches:
only:
- master
- release

configuration:
- debug
- release

skip_tags: true
Expand Down Expand Up @@ -53,6 +51,7 @@ install:
{
$latest_url = $res.GetResponseHeader("Location")
$latest_ver = $latest_url.Substring($latest_url.LastIndexOf("/") + 1)
$latest_ver = $latest_ver.Substring(0, $latest_ver.LastIndexOf("-"))
$download_url = "https://bintray.com/pony-language/ponyc-win/download_file?file_path=" + $latest_ver + "-win64.zip"
Invoke-WebRequest -Uri $download_url -OutFile ponyc.zip
Expand-Archive "ponyc.zip" -DestinationPath "."
Expand Down
36 changes: 36 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: 2
jobs:
vs-ponyc-release:
docker:
- image: ponylang/ponyc:release
steps:
- checkout
- run: make test
vs-ponyc-master:
docker:
- image: ponylang/ponyc:latest
steps:
- checkout
- run: make test
verify-changelog:
docker:
- image: ponylang/changelog-tool:release
steps:
- checkout
- run: changelog-tool verify CHANGELOG.md

workflows:
version: 2
commit:
jobs:
- verify-changelog
- vs-ponyc-release
nightly:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only: master
jobs:
- vs-ponyc-master
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ deploy:
- provider: bintray
user: pony-buildbot-2
file: /home/travis/build/ponylang/pony-stable/bintray_debian.json
skip_cleanup: true
on:
branch: release
key:
Expand All @@ -38,6 +39,7 @@ deploy:
- provider: bintray
user: pony-buildbot-2
file: /home/travis/build/ponylang/pony-stable/bintray_rpm.json
skip_cleanup: true
on:
branch: release
key:
Expand Down
23 changes: 0 additions & 23 deletions .travis_script.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,6 @@
set -o errexit
set -o nounset

pony-stable-test(){
echo "Running Pony-stable tests"
make test
}

verify-changelog(){
echo "Installing stable so we can build changelog tool..."
sudo make install

echo "Building changelog tool..."
pushd /tmp

git clone "https://github.com/ponylang/changelog-tool"
cd changelog-tool && git checkout tags/0.2.0 && make && sudo make install && cd -

popd

changelog-tool verify CHANGELOG.md
}

pony-stable-build-packages(){
echo "Installing ruby, rpm, and fpm..."
rvm use 2.2.3 --default
Expand All @@ -41,7 +21,4 @@ pony-stable-build-packages(){
if [[ "$TRAVIS_BRANCH" == "release" && "$TRAVIS_PULL_REQUEST" == "false" ]]
then
pony-stable-build-packages
else
pony-stable-test
verify-changelog
fi
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to the Pony compiler and standard library will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).

## [0.1.2] - 2018-05-25

### Fixed

- Update usage of Env.exitcode to be compatible with ponyc 0.22.x ([PR #56](https://github.com/ponylang/pony-stable/pull/56))
- Fixed issue with the way the `.deps` directory is updated to avoid problems with non-master versions

## [0.1.1] - 2017-10-16

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ package = build/$(package_name)-$(package_version)
# Note: linux only
define EXPAND_DEPLOY
deploy: test
$(SILENT)bash .bintray.bash debian "$(package_version)" "$(package_name)"
$(SILENT)bash .bintray.bash rpm "$(package_version)" "$(package_name)"
$(SILENT)bash .bintray.bash source "$(package_version)" "$(package_name)"
$(SILENT)bash .bintray.bash debian "$(package_base_version)" "$(package_name)"
$(SILENT)bash .bintray.bash rpm "$(package_base_version)" "$(package_name)"
$(SILENT)bash .bintray.bash source "$(package_base_version)" "$(package_name)"
$(SILENT)rm -rf build/bin
@mkdir -p build/bin
@mkdir -p $(package)/usr/bin
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ sudo mv bintray-pony-language-pony-stable-rpm.repo /etc/zypp/repos.d/
sudo zypper install pony-stable
```

### Arch-Linux (AUR)

```bash
pacaur -S pony-stable-git
```

### From Source

You will need `ponyc` in your PATH.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.1
0.1.2
6 changes: 3 additions & 3 deletions stable/dep.pony
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class DepGitHub
fun ref fetch() ? =>
let fpath = FilePath(bundle.path, root_path())?
if fpath.exists() then
Shell("git -C " + root_path() + " pull " + url())?
Shell("git -C " + root_path() + " fetch")?
else
fpath.mkdir()
Shell("git clone " + url() + " " + root_path())?
Expand Down Expand Up @@ -107,7 +107,7 @@ class DepLocal
let bundle: Bundle box
let info: JsonObject box
let local_path: String

new create(b: Bundle box, i: JsonObject box) ? =>
bundle = b
info = i
Expand All @@ -131,5 +131,5 @@ primitive _CheckoutTag
fun apply(root_path: String, git_tag: (String | None)) ? =>
match git_tag
| let str: String =>
Shell("cd " + root_path + " && git checkout " + str)?
Shell("cd " + root_path + " && git checkout " + str)?
end
25 changes: 18 additions & 7 deletions stable/main.pony
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ actor Main
error
end

fun command("fetch", _) =>
fun command_fetch() =>
try _load_bundle()?.fetch() end

fun command("env", rest: Array[String] box) =>
fun command_env(rest: Array[String] box) =>
let ponypath =
try
let bundle = _load_bundle()?
Expand All @@ -79,23 +79,34 @@ actor Main
cmd.append(arg)
end
cmd.append("\"")
Shell(consume cmd, env~exitcode())?
Shell(consume cmd, env.exitcode)?
else
Shell.from_array(
["env"; "PONYPATH=" + ponypath] .> append(rest), env~exitcode())?
["env"; "PONYPATH=" + ponypath] .> append(rest), env.exitcode)?
end
end

fun command("add", rest: Array[String] box) =>
fun command_add(rest: Array[String] box) =>
try
let bundle = _load_bundle(true)?
let added_json = Add(rest, log)?
bundle.add_dep(added_json)?
bundle.fetch()
end

fun command("version", rest: Array[String] box) =>
fun command_version(rest: Array[String] box) =>
env.out.print(Version())

fun command(s: String, rest: Array[String] box) =>
_print_usage()
match s
| "fetch" =>
command_fetch()
| "env" =>
command_env(rest)
| "add" =>
command_add(rest)
| "version" =>
command_version(rest)
else
_print_usage()
end
4 changes: 2 additions & 2 deletions stable/shell.pony
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use @system[I32](command: Pointer[U8] tag)

interface _ExitCodeFn
fun ref apply(code: I32)
interface val _ExitCodeFn
fun apply(code: I32)

// TODO: Remove Shell hack in favor of cap-based implementations of actions.
primitive Shell
Expand Down

0 comments on commit 2af1a62

Please sign in to comment.