Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Coverage of the following flickers notoriously despite no changes being made.
# We'll ignore them until we find a way to have reliable coverage measurements for them.
ignore:
- "roscala/src/main/scala/coop/rchain/roscala/ob/Tuple.scala"
- "roscala/src/main/scala/coop/rchain/roscala/ob/mbox/QueueMbox.scala"
- "roscala/src/main/scala/io/rhonix/roscala/ob/Tuple.scala"
- "roscala/src/main/scala/io/rhonix/roscala/ob/mbox/QueueMbox.scala"
14 changes: 7 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ __pr_build_condiditions: &pr_build_conditions
event: [ pull_request ]

__buildenv: &buildenv
image: rchain/buildenv:latest
image: rhonix/buildenv:latest

__sbtcompileenv: &sbtcompileenv
<<: *buildenv
environment:
- _JAVA_OPTIONS=-Xms2G -Xmx4G -Xss2m -XX:MaxMetaspaceSize=1G
-Dsbt.task.timings=true -Dsbt.task.timings.on.shutdown=true -Dsbt.task.timings.threshold=2000
volumes:
- /var/cache/rchain-build/.sbt:/root/.sbt
- /var/cache/rchain-build/.ivy2:/root/.ivy2
- /var/cache/rhonix-build/.sbt:/root/.sbt
- /var/cache/rhonix-build/.ivy2:/root/.ivy2

__sbttestenv: &sbttestenv
<<: *sbtcompileenv
Expand All @@ -46,7 +46,7 @@ __sbttestenv: &sbttestenv

clone:
git-clone:
image: rchain/buildenv:latest
image: rhonix/buildenv:latest
commands: |
set -ex
git clone -b ${DRONE_TAG:-$DRONE_BRANCH} $DRONE_REMOTE_URL .
Expand Down Expand Up @@ -103,8 +103,8 @@ pipeline:
# Skip the `doc` task - it's being invoked explicitly later
- SKIP_DOC=true sbt node/docker:publishLocal
volumes:
- /var/cache/rchain-build/.sbt:/root/.sbt
- /var/cache/rchain-build/.ivy2:/root/.ivy2
- /var/cache/rhonix-build/.sbt:/root/.sbt
- /var/cache/rhonix-build/.ivy2:/root/.ivy2
- /var/run/docker.sock:/var/run/docker.sock

run-unit-tests:
Expand Down Expand Up @@ -134,7 +134,7 @@ pipeline:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /tmp:/tmp
- /var/tmp/rchain-it:/var/tmp/rchain-it
- /var/tmp/rhonix-it:/var/tmp/rhonix-it

package:
<<: *branch_build_conditions
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/10_ask_question.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ about: Asking a question related to RNode software
labels: question
---

<!-- For questions related to RChain platform improvement process please open an issue on
RChain Improvement Proposals repository https://github.com/rchain/rchip-proposals/issues. -->
<!-- For questions related to Rhonix platform improvement process please open an issue on
Rhonix Improvement Proposals repository https://github.com/rchain/rchip-proposals/issues. -->

<!-- Make sure you include information that can help us understand your question. -->

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/20_bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Report a bug
about: Create a bug report to help us improve RChain platform
about: Create a bug report to help us improve Rhonix platform
labels: bug
---

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/30_documentation.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
name: Request documentation improvement
about: Suggest an enhancement related to documentation in RChain repository
about: Suggest an enhancement related to documentation in Rhonix repository
labels: enhancement
---

<!-- Thank you very much for your feedback. -->

<!-- Please answer these questions before submitting a request. -->

### If this relates to existing RChain documentation, please provide the complete, specific URL and location in the page
### If this relates to existing Rhonix documentation, please provide the complete, specific URL and location in the page


### Please describe the problem including, missing, unclear or incorrect documentation
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Propose RChain platform improvement (RCHIP)
- name: Propose Rhonix platform improvement (RCHIP)
url: https://github.com/rchain/rchip-proposals/issues
about: For RChain platform feature requests, you can consider open an issue on RChain Improvement Proposals repository
about: For Rhonix platform feature requests, you can consider open an issue on Rhonix Improvement Proposals repository
- name: Report security bug
url: https://docs.google.com/forms/d/1HzG8R0ex122YFYZsmb6QTOv4a0C9i_vwHjB9cpQGjBE
about: Please report security related bugs here
10 changes: 5 additions & 5 deletions .github/init-environment
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
set -eu -o pipefail

# This script initializes the environment for running other tasks on GitHub
# CI runners. It's mostly run from rchain/buildenv container but can be
# CI runners. It's mostly run from rhonix/buildenv container but can be
# used on runner host as well. See comments in code for further info.


# This directory is cached by actions/cache GitHub action in the workflow.
CACHE_ROOT=/var/cache/rchain-build
CACHE_ROOT=/var/cache/rhonix-build


# It may happen that we inadvertently cache something bad or the cache grows too
Expand All @@ -32,7 +32,7 @@ CACHE_KEY_PREFIX_PYTHON=python-$cache_epoch_python-
#
# Before creating the cache directory, it tries to move first existing target to
# it, to preserve existing content. For instance, ~/.sbt is already populated in
# rchain/buildenv Docker image and we want to preserve it in cache.
# rhonix/buildenv Docker image and we want to preserve it in cache.
link_from_cache()
{
local cache_path=$CACHE_ROOT/$1
Expand Down Expand Up @@ -104,7 +104,7 @@ print_env()
# jobs:
# foo:
# name: Do foo
# container: rchain/buildenv
# container: rhonix/buildenv
# steps:
# - ...
# GitHub CI sets the HOME variable in the container to /github/home. However,
Expand All @@ -123,7 +123,7 @@ project_root=${GITHUB_WORKSPACE:-$(readlink -e "$(dirname "${BASH_SOURCE[0]}")/.
# Initialize the cache. Move directories with build dependencies into the cache.
#
# Some of these directories may be unused (yet), but that's OK. Current version
# of sbt used by RChain build (specified in project/build.properties), 1.2.8,
# of sbt used by Rhonix build (specified in project/build.properties), 1.2.8,
# uses Ivy to fetch dependencies, but version 1.3 and onwards, use Coursier,
# which saves files into ~/.cache/coursier. So let's leave whole ~/.cache there
# just in case.
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

### Please make sure that this PR:
- [x] is at most 200 lines of code (excluding tests),
- [x] meets [RChain development coding standards](https://rchain.atlassian.net/wiki/spaces/DOC/pages/28082177/Coding+Standards),
- [x] meets [Rhonix development coding standards](https://rchain.atlassian.net/wiki/spaces/DOC/pages/28082177/Coding+Standards),
- [x] includes tests for all added features,
- [x] has a reviewer assigned,
- [x] has [all commits signed](https://rchain.atlassian.net/wiki/spaces/DOC/pages/498630673/How+to+sign+commits+to+rchain+rchain).
- [x] has [all commits signed](https://rchain.atlassian.net/wiki/spaces/DOC/pages/498630673/How+to+sign+commits+to+rhonix+rhonix).

### [Bors](https://bors.tech/) cheat-sheet:

Expand Down
2 changes: 1 addition & 1 deletion .github/run-integration-test-selection
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -eu -o pipefail
# someone may initialize more variables there anyway and expect to see them in
# integration tests.
#
# When [2] is fixed, we can remove this and run whole job in the rchain/buildenv
# When [2] is fixed, we can remove this and run whole job in the rhonix/buildenv
# container. See comments in run_integration_tests job for more information.
#
# [1] https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#set-an-environment-variable-set-env
Expand Down
78 changes: 39 additions & 39 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# GitHub Actions workflow for RChain continuous integration.
# GitHub Actions workflow for Rhonix continuous integration.
#
# For information GitHub Actions see:
# https://help.github.com/en/actions/automating-your-workflow-with-github-actions/getting-started-with-github-actions
Expand Down Expand Up @@ -28,17 +28,17 @@ env:

jobs:

# Most jobs run in rchain/buildenv Docker container. This container image has
# everything needed to build RChain and run unit and integration tests. For
# Most jobs run in rhonix/buildenv Docker container. This container image has
# everything needed to build Rhonix and run unit and integration tests. For
# more information about the image see
# https://github.com/rchain/buildenv/blob/master/Dockerfile


# Build RChain and save it for next jobs.
# Build Rhonix and save it for next jobs.
build_base:
name: Build Base
runs-on: ubuntu-latest
container: rchain/buildenv
container: rhonix/buildenv
outputs:
VERSION: ${{ env.VERSION }}
BRANCH: ${{ env.BRANCH }}
Expand Down Expand Up @@ -90,21 +90,21 @@ jobs:
sbt update scalafmtCheckAll compile

- name: Pack Working Tree
run: tar -H posix -czf ../rchain-worktree.tar.gz .
run: tar -H posix -czf ../rhonix-worktree.tar.gz .

- name: Save Working Tree
uses: actions/upload-artifact@v1
with:
name: rchain-worktree
path: ../rchain-worktree.tar.gz
name: rhonix-worktree
path: ../rhonix-worktree.tar.gz


# Get compiled RChain and run unit tests.
# Get compiled Rhonix and run unit tests.
run_unit_tests:
name: Unit Tests
needs: build_base
runs-on: ubuntu-latest
container: rchain/buildenv
container: rhonix/buildenv
strategy:
fail-fast: false
matrix:
Expand All @@ -118,16 +118,16 @@ jobs:
#
# To learn about REMAINDER, see .github/run-unit-test-selection.
tests:
- "'casper/test:testOnly coop.rchain.casper.addblock.*'"
- "'casper/test:testOnly coop.rchain.casper.api.*'"
- "'casper/test:testOnly coop.rchain.casper.batch1.*'"
- "'casper/test:testOnly coop.rchain.casper.batch2.*'"
- "'casper/test:testOnly coop.rchain.casper.engine.*'"
- "'casper/test:testOnly coop.rchain.casper.genesis.*'"
- "'casper/test:testOnly coop.rchain.casper.merging.*'"
- "'casper/test:testOnly coop.rchain.casper.rholang.*'"
- "'casper/test:testOnly coop.rchain.casper.util.*'"
- "'casper/test:testOnly coop.rchain.casper.sync.*'"
- "'casper/test:testOnly io.rhonix.casper.addblock.*'"
- "'casper/test:testOnly io.rhonix.casper.api.*'"
- "'casper/test:testOnly io.rhonix.casper.batch1.*'"
- "'casper/test:testOnly io.rhonix.casper.batch2.*'"
- "'casper/test:testOnly io.rhonix.casper.engine.*'"
- "'casper/test:testOnly io.rhonix.casper.genesis.*'"
- "'casper/test:testOnly io.rhonix.casper.merging.*'"
- "'casper/test:testOnly io.rhonix.casper.rholang.*'"
- "'casper/test:testOnly io.rhonix.casper.util.*'"
- "'casper/test:testOnly io.rhonix.casper.sync.*'"
- REMAINDER # Do not modify/remove!
env:
TESTS: ${{ matrix.tests }}
Expand All @@ -138,10 +138,10 @@ jobs:
- name: Load Working Tree
uses: actions/download-artifact@v1
with:
name: rchain-worktree
name: rhonix-worktree

- name: Restore Working Tree
run: tar -H posix -xzf rchain-worktree/rchain-worktree.tar.gz
run: tar -H posix -xzf rhonix-worktree/rhonix-worktree.tar.gz

- name: Initialize Environment
run: ./.github/init-environment
Expand All @@ -159,20 +159,20 @@ jobs:
./.github/run-unit-test-selection


# Get compiled RChain, build Docker image, and save it for next jobs.
# Get compiled Rhonix, build Docker image, and save it for next jobs.
build_docker_image:
name: Build Docker Image
needs: build_base
runs-on: ubuntu-latest
container: rchain/buildenv
container: rhonix/buildenv
steps:
- name: Load Working Tree
uses: actions/download-artifact@v1
with:
name: rchain-worktree
name: rhonix-worktree

- name: Restore Working Tree
run: tar -H posix -xzf rchain-worktree/rchain-worktree.tar.gz
run: tar -H posix -xzf rhonix-worktree/rhonix-worktree.tar.gz

- name: Initialize Environment
run: ./.github/init-environment
Expand All @@ -191,7 +191,7 @@ jobs:
run: |
mkdir ../artifacts
git describe --tags --always >../artifacts/version.txt
docker image save coop.rchain/rnode \
docker image save io.rhonix/rnode \
| gzip >../artifacts/rnode-docker.tar.gz

- name: Save Docker Image
Expand All @@ -201,21 +201,21 @@ jobs:
path: ../artifacts/


# Get compiled RChain, build distro packages, and save them for next jobs.
# Get compiled Rhonix, build distro packages, and save them for next jobs.
build_packages:
name: Build Packages
needs: build_base
if: "github.event_name != 'pull_request'"
runs-on: ubuntu-latest
container: rchain/buildenv
container: rhonix/buildenv
steps:
- name: Load Working Tree
uses: actions/download-artifact@v1
with:
name: rchain-worktree
name: rhonix-worktree

- name: Restore Working Tree
run: tar -H posix -xzf rchain-worktree/rchain-worktree.tar.gz
run: tar -H posix -xzf rhonix-worktree/rhonix-worktree.tar.gz

- name: Initialize Environment
run: ./.github/init-environment
Expand Down Expand Up @@ -257,10 +257,10 @@ jobs:
# is broken[1] and we need to mount host's /tmp onto container's /tmp (see
# "Running from Docker" in integration-tests/README.md). The host doesn't have
# everything we need (pipenv, pyenv), so we're going to run integration tests
# in rchain/buildenv container started manually as the last step.
# in rhonix/buildenv container started manually as the last step.
#
# The problem is that host's runner runs everything under a non-privileged
# account, whereas the rchain/buildenv container runs as root by default. The
# account, whereas the rhonix/buildenv container runs as root by default. The
# container image does not have an account corresponding to the host's
# unprivileged account UID, so we're going to run it as root and do some
# workarounds (see below).
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
TESTS: ${{ matrix.tests }}
# We don't use $CACHE_ROOT in host because it may not be (it is not)
# writeable by host runner unprivileged account. See note above.
HOST_CACHE_ROOT: /tmp/rchain-build-cache
HOST_CACHE_ROOT: /tmp/rhonix-build-cache
# In integration tests multiple RNode instances are created so memory
# limit in lower to prevent sporadic crashes.
_JAVA_OPTIONS: -XX:MaxRAMPercentage=35.0
Expand Down Expand Up @@ -329,7 +329,7 @@ jobs:

# The cached files are owned by host runner unprivileged user. See comment
# in "Fix Cache Permissions (Post)" step for details. Some programs
# running in rchain/buildenv container as root may be unhappy about that
# running in rhonix/buildenv container as root may be unhappy about that
# (pip issues a warning). Change ownership to root to avoid possible
# problems. There are not that many cached files for integration tests so
# performance impact is likely minimal.
Expand All @@ -348,9 +348,9 @@ jobs:
-e TESTS="$TESTS" \
-e _JAVA_OPTIONS="$_JAVA_OPTIONS" \
-w /work \
rchain/buildenv ./.github/run-integration-test-selection
rhonix/buildenv ./.github/run-integration-test-selection

# Files created in rchain/buildenv container are owned by root, so we need
# Files created in rhonix/buildenv container are owned by root, so we need
# to change ownership to host runner unprivileged account here, because
# right after this step, the runner is going to save cache preserving file
# attributes, and it would fail to restore them in "Restore Cache" above
Expand Down Expand Up @@ -432,12 +432,12 @@ jobs:
img_latest="$image_name:latest"

# Release Docker image
docker tag coop.rchain/rnode:latest $img_version
docker tag io.rhonix/rnode:latest $img_version
docker push $img_version

# Tag Docker image as latest if tag is the latest on dev branch
if [[ $GITHUB_REF =~ ^refs/tags/ ]] && [[ $DEV_LATEST_TAG =~ $VERSION ]]; then
docker tag coop.rchain/rnode:latest $img_latest
docker tag io.rhonix/rnode:latest $img_latest
docker push $img_latest
fi

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Contributing to RChain
# Contributing to Rhonix

* [Coding Standards](https://rchain.atlassian.net/wiki/spaces/DOC/pages/28082177/Coding+Standards)
* [Sign your commits](https://rchain.atlassian.net/wiki/spaces/DOC/pages/498630673/How+to+sign+commits+to+rchain+rchain)
* [Sign your commits](https://rchain.atlassian.net/wiki/spaces/DOC/pages/498630673/How+to+sign+commits+to+rhonix+rhonix)
* [Code Review Process](https://rchain.atlassian.net/wiki/spaces/DOC/pages/44040200/Code+Review+Process)
* [Github Workflow](https://rchain.atlassian.net/wiki/spaces/DOC/pages/44007462/Github+Fork-n-Beans+Workflow)
* We use [Travis CI](https://travis-ci.org) for unit testing. We require passage of unit tests to merge PRs. To start this automated testing in a PR, please assure you have an account with Travis based on your GitHub account. See [Travis CI](https://travis-ci.org) to confirm or create your account.
* Information about setting up your development environment and the structure of the RChain GitHub repository is available in [RChain/README.md](https://github.com/rchain/rchain/blob/master/README.md).
* Information about setting up your development environment and the structure of the Rhonix GitHub repository is available in [Rhonix/README.md](https://github.com/rhonixlabs/rhonix/blob/master/README.md).

If you're picking up someone else's pull request, then whatever you
do must preserve the commit history. We're not going to squash commits
Expand Down
Loading