Browse Source

Minor fixes for migration to master

bors/trying
Andreas Triantafyllos 3 years ago
parent
commit
d688a3c0f5
No known key found for this signature in database
GPG Key ID: 3E0D3E3D719D622B
  1. 2
      .buildkite/pipeline.yml
  2. 2
      .github/ISSUE_TEMPLATE/epic-template.md
  3. 5
      CONTRIBUTING.md
  4. 6
      README.md
  5. 6
      iohk-monitoring/README.md

2
.buildkite/pipeline.yml

@ -15,7 +15,7 @@ steps:
- "./stack-rebuild --show-trace"
agents:
system: x86_64-linux
branches: "develop master"
branches: "master"
- label: "make TeX documentation"
command: "cd docs; nix-shell --run make"

2
.github/ISSUE_TEMPLATE/epic-template.md

@ -32,6 +32,6 @@ e.g.: The API _must_ ..., the module _should_.>
| Number | Base |
| --- | --- |
| [][PR-1] | `develop` |
| [][PR-1] | `master` |
[PR-1]: https://github.com/input-output-hk/iohk-monitoring-framework/pull/

5
CONTRIBUTING.md

@ -1,9 +1,6 @@
Contributing
============
`develop`: development happens here; submit PRs against this branch
`master` : contains versioned releases that can be referenced from other repos
Bugs
----
If you want to submit a *bug*, please search the existing issues and if an appropriate issue was found, then add a comment with your report there.
@ -22,7 +19,7 @@ Work items are selected weekly into the *Selected* column of the kanban board. T
Submitting PRs
--------------
Pull requests should be opened against `develop`.
Pull requests should be opened against `master`.
a) Please describe the PR in as much detail as would be necessary to understand the code changes, and make sure the description is consistent with the changes introduced.

6
README.md

@ -1,8 +1,8 @@
# iohk-monitoring-framework
[![Release version](https://img.shields.io/github/release-pre/input-output-hk/iohk-monitoring-framework.svg)](https://github.com/input-output-hk/iohk-monitoring-framework/releases)
[![Build status](https://badge.buildkite.com/1cc7939a1fed4972c15b8f87d510e0404b0eb65d73cfd1e30b.svg?branch=develop)](https://buildkite.com/input-output-hk/iohk-monitoring-framework)
[![Coverage Status](https://coveralls.io/repos/github/input-output-hk/iohk-monitoring-framework/badge.svg?branch=develop)](https://coveralls.io/github/input-output-hk/iohk-monitoring-framework?branch=develop)
[![Build status](https://badge.buildkite.com/1cc7939a1fed4972c15b8f87d510e0404b0eb65d73cfd1e30b.svg?branch=master)](https://buildkite.com/input-output-hk/iohk-monitoring-framework)
[![Coverage Status](https://coveralls.io/repos/github/input-output-hk/iohk-monitoring-framework/badge.svg?branch=master)](https://coveralls.io/github/input-output-hk/iohk-monitoring-framework?branch=master)
This framework provides logging, benchmarking and monitoring.
@ -25,7 +25,7 @@ And, introductory one-pagers on logging and benchmarking are available in [pdf](
`cabal new-test all`
## examples
https://github.com/input-output-hk/iohk-monitoring-framework/edit/develop/README.md
https://github.com/input-output-hk/iohk-monitoring-framework/edit/master/README.md
Some examples are available in the directory `examples`:
* `simple` - run with `cabal new-run example-simple`
* `complex` - run with `cabal new-run example-complex`

6
iohk-monitoring/README.md

@ -1,7 +1,7 @@
# iohk-monitoring-framework
[![Build status](https://badge.buildkite.com/1cc7939a1fed4972c15b8f87d510e0404b0eb65d73cfd1e30b.svg?branch=develop)](https://buildkite.com/input-output-hk/iohk-monitoring-framework)
[![Coverage Status](https://coveralls.io/repos/github/input-output-hk/iohk-monitoring-framework/badge.svg?branch=develop)](https://coveralls.io/github/input-output-hk/iohk-monitoring-framework?branch=develop)
[![Build status](https://badge.buildkite.com/1cc7939a1fed4972c15b8f87d510e0404b0eb65d73cfd1e30b.svg?branch=master)](https://buildkite.com/input-output-hk/iohk-monitoring-framework)
[![Coverage Status](https://coveralls.io/repos/github/input-output-hk/iohk-monitoring-framework/badge.svg?branch=master)](https://coveralls.io/github/input-output-hk/iohk-monitoring-framework?branch=master)
This framework provides logging, benchmarking and monitoring.
@ -22,7 +22,7 @@ Presentations and more documentation is available from our [docs](https://input-
`cabal new-test pkg:iohk-monitoring:tests`
## examples
https://github.com/input-output-hk/iohk-monitoring-framework/edit/develop/README.md
https://github.com/input-output-hk/iohk-monitoring-framework/edit/master/README.md
Some examples are available in the directory `examples`:
* `simple` - run with `cabal new-run example-simple`
* `complex` - run with `cabal new-run example-complex`

Loading…
Cancel
Save