Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
Signed-off-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru>
  • Loading branch information
appetrosyan committed Mar 23, 2023
2 parents fd0d5dd + 8604550 commit 714b4f2
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 76 deletions.
50 changes: 19 additions & 31 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,33 @@
<!-- You will not see HTML commented line in Pull Request body -->
<!-- Optional sections may be omitted. Just remove them or write None -->
## Description

<!-- ### Requirements -->
<!-- * Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion. -->
<!-- * All new code must have code coverage above 70% (https://docs.codecov.io/docs/about-code-coverage). -->
<!-- * CircleCI builds must be passed. -->
<!-- * Critical and blocker issues reported by Sorabot must be fixed. -->
<!-- * Branch must be rebased onto base branch (https://soramitsu.atlassian.net/wiki/spaces/IS/pages/11173889/Rebase+and+merge+guide). -->
<!-- Just describe what you did. -->

<!-- Skip if the title of the PR is self-explanatory -->

### Description of the Change
### Linked issue

<!-- We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. -->
<!-- Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts. -->
<!-- Duplicate the main issue and add additional issues closed by this PR. -->

### Issue
Closes #{issue_number} <!-- Replace with an actual number, -->

<!-- Put in the note about what issue is resolved by this PR, especially if it is a GitHub issue. It should be in the form of "Resolves #N" ("Closes", "Fixes" also work), where N is the number of the issue.
More information about this is available in GitHub documentation: https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword -->

<!-- If it is not a GitHub issue but a JIRA issue, just put the link here -->
<!-- Link if e.g. JIRA issue or from another repository -->

### Benefits

<!-- What benefits will be realized by the code change? -->

### Possible Drawbacks

<!-- What are the possible side-effects or negative impacts of the code change? -->
<!-- If no drawbacks, explicitly mention this (write None) -->

### Usage Examples or Tests *[optional]*
<!-- EXAMPLE: users can't revoke their own right to revoke rights -->

<!-- Point reviewers to the test, code example or documentation which shows usage example of this feature -->
### Checklist

### Alternate Designs *[optional]*
- [ ] I've read `CONTRIBUTING.md`
- [ ] I've used the standard signed-off commit format (or will squash just before merging)
- [ ] All applicable CI checks pass (or I promised to make them pass later)
- [ ] (optional) I've written unit tests for the code changes
- [ ] I replied to all comments after code review, marking all implemented changes with thumbs up

<!-- Explain what other alternates were considered and why the proposed version was selected -->
<!-- HINT: Add more points to checklist for large draft PRs-->

<!--
NOTE: User may want skip pull request and push workflows with [skip ci]
https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/
Phrases: [skip ci], [ci skip], [no ci], [skip actions], or [actions skip]
<!-- USEFUL LINKS
- https://www.secondstate.io/articles/dco
- https://discord.gg/hyperledger (please ask us any questions)
- https://t.me/hyperledgeriroha (if you prefer telegram)
-->
22 changes: 22 additions & 0 deletions .github/workflows/iroha2-ci-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: I2::CI::Publish

on: workflow_dispatch

jobs:
dockerhub:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push iroha2-ci image
uses: docker/build-push-action@v4
with:
push: true
tags: hyperledger/iroha2-ci:nightly-2022-12-22
labels: commit=${{ github.sha }}
file: Dockerfile.build
# This context specification is required
context: .
6 changes: 4 additions & 2 deletions .github/workflows/iroha2-dev-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ jobs:
dockerhub:
runs-on: ubuntu-latest
container:
image: 7272721/i2-ci:nightly
image: hyperledger/iroha2-ci:nightly-2022-12-22
steps:
- uses: actions/checkout@v3
- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push iroha2:dev-nightly image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
push: true
tags: hyperledger/iroha2:dev-nightly-${{ github.sha }}
labels: commit=${{ github.sha }}
build-args: TAG=dev
# This context specification is required
context: .
39 changes: 0 additions & 39 deletions .github/workflows/iroha2-push-nightly.yml

This file was deleted.

8 changes: 4 additions & 4 deletions docs/source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ docopt==0.6.2
docutils==0.14
idna==2.6
imagesize==0.7.1
Jinja2
Jinja2>=3.1.2
livereload==2.5.1
MarkupSafe
MarkupSafe>=2.1.2
pathtools==0.1.2
pipreqs==0.4.9
port-for==0.3.1
protobuf==3.18.3
Pygments==2.7.4
pytz==2017.3
pytz>=2022.7.1
PyYAML==5.4
requests
restructuredtext-lint==1.1.2
singledispatch==3.4.0.3
six==1.11.0
snowballstemmer==1.2.1
Sphinx
Sphinx==5.1.1
sphinx-autobuild==0.7.1
sphinx-intl==0.9.11
sphinx-rtd-theme==0.4.2
Expand Down

0 comments on commit 714b4f2

Please sign in to comment.