Skip to content

Commit 52e0d9c

Browse files
kuvaldinikuvaldini
committed
Merge branch 'main' into develop
2 parents ecbc584 + 349e7d7 commit 52e0d9c

File tree

3 files changed

+49
-10
lines changed

3 files changed

+49
-10
lines changed

‎.github/build-iroha1.src.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
set -x
9999
[[ $(./.github/make-workflows.sh -x --worktree) = *"everything is up to date" ]]
100100
101+
## Just to react to valid comment with rocket
101102
pr_comment_reaction_rocket:
102103
## Just to react to valid comment with rocket
103104
runs-on: ubuntu-20.04 #ubuntu-latest
@@ -141,7 +142,6 @@ jobs:
141142
if: ${{ (github.event_name != 'comment') || ( github.event.comment &&
142143
github.event.issue.pull_request &&
143144
startsWith(github.event.comment.body, '/build') ) }}
144-
# needs: check_workflow_yaml_coressponds_to_src_yaml
145145
steps:
146146
- *step_show_context
147147
- *step_detect_commented_pr
@@ -156,7 +156,7 @@ jobs:
156156
if: ${{ steps.comment_body.outcome == 'skipped' }} ## i.e. not github.event.issue.pull_request
157157
run: |
158158
set -x
159-
git fetch origin ${{github.event.after}} --depth=2 ## depth=2 to detect if fetched commit is merge commit
159+
git fetch origin ${{github.event.pull_request.head.sha}} --depth=2 ## depth=2 to detect if fetched commit is merge commit
160160
git log -1 FETCH_HEAD
161161
commit_message_body_build_spec(){
162162
git log -n1 $1 --format=%B | grep '^/build '
@@ -435,7 +435,7 @@ jobs:
435435
## Build iroha in a container made of the image earlier prepared
436436
## Result artifacts are
437437
## - stand-alone irohad (linked statically)
438-
## - iroha.deb (with irohad inside)
438+
## - iroha.deb (with irohad, migration-tool, wsv_checker inside)
439439
build-UD: &job_ubuntu
440440
needs:
441441
- Docker-iroha-builder
@@ -536,7 +536,7 @@ jobs:
536536
uses: actions/cache@v2
537537
with:
538538
path: ${{ env._CCACHE_DIR }}
539-
key: ${{runner.os}}-ccache-${{ github.event.after }}
539+
key: ${{runner.os}}-ccache-${{ github.event.pull_request.head.sha }}
540540
restore-keys: ${{runner.os}}-ccache-
541541
- &step_store_ccache_stats
542542
run: ccache --show-stats | tee /tmp/ccache-stats

‎.github/workflows/build-iroha1.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
run: |
9494
set -x
9595
[[ $(./.github/make-workflows.sh -x --worktree) = *"everything is up to date" ]]
96+
## Just to react to valid comment with rocket
9697
pr_comment_reaction_rocket:
9798
## Just to react to valid comment with rocket
9899
runs-on: ubuntu-20.04 #ubuntu-latest
@@ -129,7 +130,6 @@ jobs:
129130
runs-on: ubuntu-20.04 #ubuntu-latest
130131
#container: ubuntu:latest
131132
if: ${{ (github.event_name != 'comment') || ( github.event.comment && github.event.issue.pull_request && startsWith(github.event.comment.body, '/build') ) }}
132-
# needs: check_workflow_yaml_coressponds_to_src_yaml
133133
steps:
134134
- name: Show context
135135
run: |
@@ -165,7 +165,7 @@ jobs:
165165
if: ${{ steps.comment_body.outcome == 'skipped' }} ## i.e. not github.event.issue.pull_request
166166
run: |
167167
set -x
168-
git fetch origin ${{github.event.after}} --depth=2 ## depth=2 to detect if fetched commit is merge commit
168+
git fetch origin ${{github.event.pull_request.head.sha}} --depth=2 ## depth=2 to detect if fetched commit is merge commit
169169
git log -1 FETCH_HEAD
170170
commit_message_body_build_spec(){
171171
git log -n1 $1 --format=%B | grep '^/build '
@@ -458,7 +458,7 @@ jobs:
458458
## Build iroha in a container made of the image earlier prepared
459459
## Result artifacts are
460460
## - stand-alone irohad (linked statically)
461-
## - iroha.deb (with irohad inside)
461+
## - iroha.deb (with irohad, migration-tool, wsv_checker inside)
462462
build-UD:
463463
needs:
464464
- Docker-iroha-builder
@@ -588,7 +588,7 @@ jobs:
588588
uses: actions/cache@v2
589589
with:
590590
path: ${{ env._CCACHE_DIR }}
591-
key: ${{runner.os}}-ccache-${{ github.event.after }}
591+
key: ${{runner.os}}-ccache-${{ github.event.pull_request.head.sha }}
592592
restore-keys: ${{runner.os}}-ccache-
593593
- run: ccache --show-stats | tee /tmp/ccache-stats
594594
- #if: ${{false}} ## This works bad when something patched or something updated, seems they does not recalc hash of changed packages. See todos in the begining of file.
@@ -895,7 +895,7 @@ jobs:
895895
uses: actions/cache@v2
896896
with:
897897
path: ${{ env._CCACHE_DIR }}
898-
key: ${{runner.os}}-ccache-${{ github.event.after }}
898+
key: ${{runner.os}}-ccache-${{ github.event.pull_request.head.sha }}
899899
restore-keys: ${{runner.os}}-ccache-
900900
- run: ccache --show-stats | tee /tmp/ccache-stats
901901
- #if: ${{false}} ## This works bad when something patched or something updated, seems they does not recalc hash of changed packages. See todos in the begining of file.
@@ -1203,7 +1203,7 @@ jobs:
12031203
uses: actions/cache@v2
12041204
with:
12051205
path: ${{ env._CCACHE_DIR }}
1206-
key: ${{runner.os}}-ccache-${{ github.event.after }}
1206+
key: ${{runner.os}}-ccache-${{ github.event.pull_request.head.sha }}
12071207
restore-keys: ${{runner.os}}-ccache-
12081208
- run: ccache --show-stats | tee /tmp/ccache-stats
12091209
- #if: ${{false}} ## This works bad when something patched or something updated, seems they does not recalc hash of changed packages. See todos in the begining of file.

‎.github/workflows/iroha2-push-nightly.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Push Iroha2 to Dockerhub as nightly
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
tag-nightly:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Check Dockerhub credentials
11+
run: |
12+
set -x
13+
test -n "${{ secrets.DOCKERHUB_ORG }}"
14+
test -n "${{ secrets.DOCKERHUB_USERNAME }}"
15+
test -n "${{ secrets.DOCKERHUB_TOKEN }}"
16+
- name: Build and push Iroha Docker image
17+
uses: docker/build-push-action@v1.1.0
18+
with:
19+
username: ${{ secrets.DOCKERHUB_USERNAME }}
20+
password: ${{ secrets.DOCKERHUB_TOKEN }}
21+
repository: hyperledger/iroha2
22+
tags: iroha2-nightly-${{ github.sha }}
23+
build_args: TARGET_DIR=release,PROFILE=--release
24+
- name: Build and push Iroha Client CLI Docker image
25+
uses: docker/build-push-action@v1.1.0
26+
with:
27+
username: ${{ secrets.DOCKERHUB_USERNAME }}
28+
password: ${{ secrets.DOCKERHUB_TOKEN }}
29+
repository: hyperledger/iroha2
30+
tags: iroha2-client-cli-nightly-${{ github.sha }}
31+
build_args: BIN=iroha_client_cli,TARGET_DIR=release,PROFILE=--release
32+
- name: Build and push Iroha Crypto CLI Docker image
33+
uses: docker/build-push-action@v1.1.0
34+
with:
35+
username: ${{ secrets.DOCKERHUB_USERNAME }}
36+
password: ${{ secrets.DOCKERHUB_TOKEN }}
37+
repository: hyperledger/iroha2
38+
tags: iroha2-crypto-cli-nightly-${{ github.sha }}
39+
build_args: BIN=iroha_crypto_cli,TARGET_DIR=release,PROFILE=--release

0 commit comments

Comments
 (0)