Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to Master #3081

Merged
merged 27 commits into from
May 12, 2023
+2,896 −555
Merged

Develop to Master #3081

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fdb8e79
Fix/gRPC drop stream bugfix (#2749)
iceseer Oct 12, 2022
b8ddc67
Allow configuring max past time of transaction `created_time` (#1776)
baziorek Oct 20, 2022
686053d
Follow-up: 1776: changed variable type from time_t to moderm c++ std:…
baziorek Oct 21, 2022
925163c
Repaired building iroha according to instruction: Added patch file to…
baziorek Oct 24, 2022
1e90d5f
Add Iroha select label and restore temporary changes (#2903)
safinsaf Oct 24, 2022
6fc436a
Repaired building iroha according to instruction: Added patch file to…
baziorek Oct 24, 2022
d5d7551
Added not empty author of the commit in last patch file
baziorek Oct 24, 2022
cef5e4d
Remove cache from main workflow
safinsaf Oct 25, 2022
fc4a140
[iroha-lib] Implement iroha library as a separate module.
andprogrammer Oct 25, 2022
d93228d
[iroha-lib] Added more descriptive Readme file.
andprogrammer Nov 10, 2022
e0025d5
Added missing dependence to requirements.txt file
baziorek Nov 11, 2022
8858ba2
Update docs/source/build/index.rst
baziorek Nov 16, 2022
3affec2
Update index.rst
baziorek Nov 16, 2022
77fafcc
Merge branch 'main' into develop
safinsaf Jan 25, 2023
2257628
Fix in iroha-cpp library + added example
Feb 13, 2023
fac89d4
Update iroha-lib/examples/DomainAssetCreation.cpp
baziorek Mar 14, 2023
9b84f5d
Updates after review
Mar 17, 2023
a791070
Updates after review v2
Mar 17, 2023
fd0d5dd
Updates after review v3
Mar 18, 2023
714b4f2
Merge branch 'main' into develop
appetrosyan Mar 23, 2023
fdc2c1e
Update vcpkg from last release
safinsaf Mar 27, 2023
829357f
Enable mac build in PR
safinsaf Mar 27, 2023
82b7e70
Fix sources
safinsaf Mar 27, 2023
3b40f22
1. Added path to fix building benchmark library on MacOS
Mar 31, 2023
63f8688
Add autoconf dep
safinsaf Apr 4, 2023
fef6a34
Corrections in MR: #3081 (develop -> master)
Mar 24, 2023
5d913a2
Merge branch 'main' into develop
appetrosyan May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/build-iroha1-fork.src.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
check_if_pull_request_comes_from_fork:
runs-on: ubuntu-20.04 #ubuntu-latest
permissions: read-all
name: Pull requests from forks should use this workflow
name: Pull requests from forks should use this workflow
if: github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
steps:
- &step_show_context
Expand All @@ -44,8 +44,8 @@ jobs:
uses: actions/checkout@v2
with: &step_checkout_with_head
ref: ${{ github.event.pull_request.head.sha }}
-
name: Filter files

- name: Filter files
uses: dorny/paths-filter@v2
id: filter
with:
Expand All @@ -70,13 +70,13 @@ jobs:
run: |
echo "Pull requests from forks are not allowed to change Dockerfiles"
false

- name: verify build depedencies script is not changed
if: steps.filter.outputs.build_dependecies == 'true'
run: |
echo "Pull requests from forks are not allowed to change build dependencies script"
false

## This job is to generate build matrixes for build jobs
## The matrixes depend on what is requeted to be build
## At the moment there are several options:
Expand Down Expand Up @@ -118,12 +118,12 @@ jobs:
commit_was_merged_build_spec(){
git_is_merge_commit $1 &&
git log -n1 $1 --format=%s | grep -q '^Merge branch' &&
echo "/build before-merge"
echo "/build ubuntu debug release normal gcc-10"
}
case ${{github.event_name}} in
pull_request_target) if commit_message_body_build_spec FETCH_HEAD >/tmp/comment_body ;then
if git_is_merge_commit FETCH_HEAD ;then
echo ::warning::'/build directive in merge commit overrides default "/build before-merge"'
echo ::warning::'/build directive in merge commit overrides default "/build ubuntu debug release normal gcc-10"'
fi
elif commit_was_merged_build_spec FETCH_HEAD >/tmp/comment_body ;then
true
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
matrix_dockerimage_release: ${{steps.matrixes.outputs.matrix_dockerimage_release}}
matrix_dockerimage_debug: ${{steps.matrixes.outputs.matrix_dockerimage_debug}}

## Build docker image named 'hyperledger/iroha-builder' with all stuff to compile iroha and its dependancies
## Build docker image named 'hyperledger/iroha-builder' with all stuff to compile iroha and its dependencies
## The result docker image is pushed with tags :pr-NUMBER, :commit-HASH, :branch-name, :tag-name,
## and conditional tags :edge for development branch, and :latest for git-tags.
Docker-iroha-builder:
Expand Down Expand Up @@ -329,7 +329,7 @@ jobs:
needs:
- Docker-iroha-builder
- generate_matrixes
runs-on: [ self-hosted, Linux ]
runs-on: [ self-hosted, Linux, iroha ]
permissions: read-all
container: ## Container is taken from previous job
image: &container_image ${{needs.Docker-iroha-builder.outputs.container}}
Expand Down Expand Up @@ -413,7 +413,7 @@ jobs:
key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }}
restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.
- &step_vcpkg_build
name: Build iroha vcpkg dependancies
name: Build iroha vcpkg dependencies
run: ./vcpkg/build_iroha_deps.sh $PWD/vcpkg-build; test -f $PWD/vcpkg-build/scripts/buildsystems/vcpkg.cmake
## Takes 48m16s on default GitHub runner with 2 cores
## Takes 13m41s on self-hosted AWS EC2 c5.x4large
Expand Down Expand Up @@ -751,7 +751,7 @@ jobs:
needs:
- build-UR
- generate_matrixes
runs-on: [ self-hosted, Linux ] #ubuntu-latest
runs-on: [ self-hosted, Linux, iroha ] #ubuntu-latest
# strategy: *strategy_ubuntu_release
# if: *if_ubuntu_release
strategy:
Expand Down
94 changes: 47 additions & 47 deletions .github/build-iroha1.src.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,13 @@ jobs:
- &step_docker_buildx
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- &step_docker_cache
name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{env.dockertag}}
restore-keys: ${{ runner.os }}-buildx-
# - &step_docker_cache
# name: Cache Docker layers
# uses: actions/cache@v2
# with:
# path: /tmp/.buildx-cache
# key: ${{ runner.os }}-buildx-${{env.dockertag}}
# restore-keys: ${{ runner.os }}-buildx-
- &step_docker_build_and_push
id: build_and_push
name: Build and push
Expand All @@ -379,14 +379,14 @@ jobs:
push: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo == github.event.pull_request.base.repo }}
tags: ${{ steps.meta_ghcr.outputs.tags }}
labels: ${{ steps.meta_ghcr.outputs.labels }}
- &step_docker_move_cache
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
# - &step_docker_move_cache
# # Temp fix
# # https://github.com/docker/build-push-action/issues/252
# # https://github.com/moby/buildkit/issues/1896
# name: Move cache
# run: |
# rm -rf /tmp/.buildx-cache
# mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
name: Check if dockertaghash exists in remote registry
id: dockertag_already
Expand All @@ -409,7 +409,7 @@ jobs:
needs:
- Docker-iroha-builder
- generate_matrixes
runs-on: [ self-hosted, Linux ]
runs-on: [ self-hosted, Linux, iroha ]
container: ## Container is taken from previous job
image: &container_image ${{needs.Docker-iroha-builder.outputs.container}}
options: --user root
Expand Down Expand Up @@ -473,24 +473,24 @@ jobs:
echo >>$GITHUB_ENV _CCACHE_DIR=$($(realpath $CCACHE_PATH/gcc) --show-config | sed -nE 's,.*cache_dir = ,,p')
echo >>$GITHUB_ENV NPROC=$(nproc | awk '{printf("%.0f",$1*0.77)}')
echo >>$GITHUB_ENV HOME=$HOME
- &step_restore_ccache
name: Restore cache CCache
uses: actions/cache@v2
with:
path: ${{ env._CCACHE_DIR }}
key: ${{runner.os}}-ccache-${{ github.event.pull_request.head.sha }}
restore-keys: ${{runner.os}}-ccache-
- &step_store_ccache_stats
run: ccache --show-stats | tee /tmp/ccache-stats
- &step_vcpkg_cache
## Read the docs https://vcpkg.readthedocs.io/en/latest/users/binarycaching/ https://github.com/microsoft/vcpkg/blob/master/docs/users/binarycaching.md
name: Restore cache Vcpkg binarycache ## NOTE not useng NuGet because on ubuntu nuget needs mono of 433MB, unusable.
uses: actions/cache@v2
with:
path: |
${{env.HOME}}/.cache/vcpkg/archives
key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }}
restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.
# - &step_restore_ccache
# name: Restore cache CCache
# uses: actions/cache@v2
# with:
# path: ${{ env._CCACHE_DIR }}
# key: ${{runner.os}}-ccache-${{ github.event.pull_request.head.sha }}
# restore-keys: ${{runner.os}}-ccache-
# - &step_store_ccache_stats
# run: ccache --show-stats | tee /tmp/ccache-stats
# - &step_vcpkg_cache
# ## Read the docs https://vcpkg.readthedocs.io/en/latest/users/binarycaching/ https://github.com/microsoft/vcpkg/blob/master/docs/users/binarycaching.md
# name: Restore cache Vcpkg binarycache ## NOTE not useng NuGet because on ubuntu nuget needs mono of 433MB, unusable.
# uses: actions/cache@v2
# with:
# path: |
# ${{env.HOME}}/.cache/vcpkg/archives
# key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }}
# restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.
- &step_vcpkg_build
name: Build iroha vcpkg dependancies
run: ./vcpkg/build_iroha_deps.sh $PWD/vcpkg-build; test -f $PWD/vcpkg-build/scripts/buildsystems/vcpkg.cmake
Expand Down Expand Up @@ -530,8 +530,8 @@ jobs:
- &step_cpack
name: CPack (linux only)
run: cd build; cpack; ## cmake --build build --target package
- &step_compare_ccache_stats
run: ccache --show-stats | diff --side-by-side /tmp/ccache-stats - ||true
# - &step_compare_ccache_stats
# run: ccache --show-stats | diff --side-by-side /tmp/ccache-stats - ||true
- &step_always_after_build
name: Show free space and disk usage
if: ${{ always() }}
Expand Down Expand Up @@ -735,13 +735,13 @@ jobs:
env:
<<: *step_export_cxx_env
CCACHE_PATH: /usr/local/opt/ccache/libexec
- *step_restore_ccache
- *step_store_ccache_stats
- *step_vcpkg_cache
# - *step_restore_ccache
# - *step_store_ccache_stats
# - *step_vcpkg_cache
- *step_vcpkg_build
- *step_cmake_configure
- *step_cmake_build
- *step_compare_ccache_stats
# - *step_compare_ccache_stats
- *step_always_after_build
- *step_artifact_suffix
- <<: *step_artifact_irohad
Expand Down Expand Up @@ -824,7 +824,7 @@ jobs:
needs:
- build-UR
- generate_matrixes
runs-on: [ self-hosted, Linux ] #ubuntu-latest
runs-on: [ self-hosted, Linux, iroha ] #ubuntu-latest
# strategy: *strategy_ubuntu_release
# if: *if_ubuntu_release
strategy:
Expand Down Expand Up @@ -873,11 +873,11 @@ jobs:
- *step_docker_login_ghcr
- *step_warn_docker_no_push
- *step_docker_buildx
- <<: *step_docker_cache
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-release-${{env.dockertag}}
restore-keys: ${{ runner.os }}-buildx-release
# - <<: *step_docker_cache
# with:
# path: /tmp/.buildx-cache
# key: ${{ runner.os }}-buildx-release-${{env.dockertag}}
# restore-keys: ${{ runner.os }}-buildx-release
- <<: *step_docker_build_and_push
with:
<<: *step_docker_build_and_push_with
Expand All @@ -887,7 +887,7 @@ jobs:
with:
<<: *step_docker_build_and_push_ghcr-with
context: docker/release/
- *step_docker_move_cache
# - *step_docker_move_cache

docker-D:
<<: *job_docker_image_release
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build-iroha1-fork.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ jobs:
commit_was_merged_build_spec(){
git_is_merge_commit $1 &&
git log -n1 $1 --format=%s | grep -q '^Merge branch' &&
echo "/build before-merge"
echo "/build ubuntu debug release normal gcc-10"
}
case ${{github.event_name}} in
pull_request_target) if commit_message_body_build_spec FETCH_HEAD >/tmp/comment_body ;then
if git_is_merge_commit FETCH_HEAD ;then
echo ::warning::'/build directive in merge commit overrides default "/build before-merge"'
echo ::warning::'/build directive in merge commit overrides default "/build ubuntu debug release normal gcc-10"'
fi
elif commit_was_merged_build_spec FETCH_HEAD >/tmp/comment_body ;then
true
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
matrix_windows: ${{steps.matrixes.outputs.matrix_windows}}
matrix_dockerimage_release: ${{steps.matrixes.outputs.matrix_dockerimage_release}}
matrix_dockerimage_debug: ${{steps.matrixes.outputs.matrix_dockerimage_debug}}
## Build docker image named 'hyperledger/iroha-builder' with all stuff to compile iroha and its dependancies
## Build docker image named 'hyperledger/iroha-builder' with all stuff to compile iroha and its dependencies
## The result docker image is pushed with tags :pr-NUMBER, :commit-HASH, :branch-name, :tag-name,
## and conditional tags :edge for development branch, and :latest for git-tags.
Docker-iroha-builder:
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
needs:
- Docker-iroha-builder
- generate_matrixes
runs-on: [self-hosted, Linux]
runs-on: [self-hosted, Linux, iroha]
permissions: read-all
container: ## Container is taken from previous job
image: ${{needs.Docker-iroha-builder.outputs.container}}
Expand Down Expand Up @@ -441,7 +441,7 @@ jobs:
${{env.HOME}}/.cache/vcpkg/archives
key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }}
restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.
- name: Build iroha vcpkg dependancies
- name: Build iroha vcpkg dependencies
run: ./vcpkg/build_iroha_deps.sh $PWD/vcpkg-build; test -f $PWD/vcpkg-build/scripts/buildsystems/vcpkg.cmake
## Takes 48m16s on default GitHub runner with 2 cores
## Takes 13m41s on self-hosted AWS EC2 c5.x4large
Expand Down Expand Up @@ -616,7 +616,7 @@ jobs:
needs:
- Docker-iroha-builder
- generate_matrixes
runs-on: [self-hosted, Linux]
runs-on: [self-hosted, Linux, iroha]
permissions: read-all
container: ## Container is taken from previous job
image: ${{needs.Docker-iroha-builder.outputs.container}}
Expand Down Expand Up @@ -720,7 +720,7 @@ jobs:
${{env.HOME}}/.cache/vcpkg/archives
key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }}
restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.
- name: Build iroha vcpkg dependancies
- name: Build iroha vcpkg dependencies
run: ./vcpkg/build_iroha_deps.sh $PWD/vcpkg-build; test -f $PWD/vcpkg-build/scripts/buildsystems/vcpkg.cmake
## Takes 48m16s on default GitHub runner with 2 cores
## Takes 13m41s on self-hosted AWS EC2 c5.x4large
Expand Down Expand Up @@ -1023,7 +1023,7 @@ jobs:
${{env.HOME}}/.cache/vcpkg/archives
key: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.${{ hashFiles('vcpkg/**') }}
restore-keys: ${{runner.os}}-vcpkg-${{env.CC_NAME}}.
- name: Build iroha vcpkg dependancies
- name: Build iroha vcpkg dependencies
run: ./vcpkg/build_iroha_deps.sh $PWD/vcpkg-build; test -f $PWD/vcpkg-build/scripts/buildsystems/vcpkg.cmake
## Takes 48m16s on default GitHub runner with 2 cores
## Takes 13m41s on self-hosted AWS EC2 c5.x4large
Expand Down Expand Up @@ -1249,7 +1249,7 @@ jobs:
working-directory:
#- *step_restore_ccache
#- *step_vcpkg_cache
- name: Build iroha vcpkg dependancies
- name: Build iroha vcpkg dependencies
run: ./vcpkg/build_iroha_deps.sh $PWD/vcpkg-build; test -f $PWD/vcpkg-build/scripts/buildsystems/vcpkg.cmake
## Takes 48m16s on default GitHub runner with 2 cores
## Takes 13m41s on self-hosted AWS EC2 c5.x4large
Expand Down Expand Up @@ -1293,7 +1293,7 @@ jobs:
needs:
- build-UR
- generate_matrixes
runs-on: [self-hosted, Linux] #ubuntu-latest
runs-on: [self-hosted, Linux, iroha] #ubuntu-latest
# strategy: *strategy_ubuntu_release
# if: *if_ubuntu_release
strategy:
Expand Down Expand Up @@ -1468,7 +1468,7 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
docker-D:
runs-on: [self-hosted, Linux] #ubuntu-latest
runs-on: [self-hosted, Linux, iroha] #ubuntu-latest
env:
IMAGE_NAME: iroha
steps:
Expand Down
Loading