From 0b7263281e37860b1c000af444d1a178807eab52 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Tue, 16 Apr 2024 14:25:14 +0300 Subject: [PATCH 1/4] Prepare updates for iroha1 CI new main branch Signed-off-by: safinsaf --- .github/build-iroha1-fork.src.yml | 2 +- .github/build-iroha1.src.yml | 4 ++-- .github/workflows/build-iroha1-fork.yml | 2 +- .github/workflows/build-iroha1.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/build-iroha1-fork.src.yml b/.github/build-iroha1-fork.src.yml index a5d10f05086..67e7193178c 100644 --- a/.github/build-iroha1-fork.src.yml +++ b/.github/build-iroha1-fork.src.yml @@ -16,7 +16,7 @@ permissions: ## This workflow is created for pull requests from forks and has less permissions than build-iroha1 workflow on: pull_request_target: - branches: [ main, support/1.*, edge, develop ] + branches: [ iroha1-main, support/1.*, edge ] env: DOCKERHUB_ORG: hyperledger diff --git a/.github/build-iroha1.src.yml b/.github/build-iroha1.src.yml index 9a8ce38ec67..5ec440042bf 100644 --- a/.github/build-iroha1.src.yml +++ b/.github/build-iroha1.src.yml @@ -45,10 +45,10 @@ name: Iroha1 ## TODO make these different workflows - reduce number of conditionals inside jobs like 'step_detect_commented_pr' on: push: - branches: [ main, support/1.*, edge, develop] + branches: [ iroha1-main, support/1.*, edge] tags: '**' pull_request: - branches: [ main, support/1.*, edge, develop] ## target branches + branches: [ iroha1-main, support/1.*, edge] ## target branches workflow_dispatch: ## NOTE: Able to run via cmdline: gh workflow run Iroha1 inputs: diff --git a/.github/workflows/build-iroha1-fork.yml b/.github/workflows/build-iroha1-fork.yml index 44348e9926f..a3f50922075 100644 --- a/.github/workflows/build-iroha1-fork.yml +++ b/.github/workflows/build-iroha1-fork.yml @@ -17,7 +17,7 @@ permissions: ## This workflow is created for pull requests from forks and has less permissions than build-iroha1 workflow on: pull_request_target: - branches: [main, support/1.*, edge, develop] + branches: [iroha1-main, support/1.*, edge] env: DOCKERHUB_ORG: hyperledger jobs: diff --git a/.github/workflows/build-iroha1.yml b/.github/workflows/build-iroha1.yml index b453060918f..310a0925598 100644 --- a/.github/workflows/build-iroha1.yml +++ b/.github/workflows/build-iroha1.yml @@ -45,10 +45,10 @@ name: Iroha1 ## TODO make these different workflows - reduce number of conditionals inside jobs like 'step_detect_commented_pr' on: push: - branches: [main, support/1.*, edge, develop] + branches: [iroha1-main, support/1.*, edge] tags: '**' pull_request: - branches: [main, support/1.*, edge, develop] ## target branches + branches: [iroha1-main, support/1.*, edge] ## target branches workflow_dispatch: ## NOTE: Able to run via cmdline: gh workflow run Iroha1 inputs: From 949324a4ab3d9e94aacec6a856742363c1ca8ef8 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Tue, 16 Apr 2024 17:32:18 +0300 Subject: [PATCH 2/4] Try fix iroha1 main tag Signed-off-by: safinsaf --- .github/build-iroha1.src.yml | 1 + .github/workflows/build-iroha1.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/build-iroha1.src.yml b/.github/build-iroha1.src.yml index 5ec440042bf..00ec6bfcecc 100644 --- a/.github/build-iroha1.src.yml +++ b/.github/build-iroha1.src.yml @@ -332,6 +332,7 @@ jobs: with: &step_docker_meta_with images: ${{ env.DOCKERHUB_ORG }}/iroha-builder tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=raw,value=${{env.dockertag}} type=ref,event=branch type=ref,event=pr diff --git a/.github/workflows/build-iroha1.yml b/.github/workflows/build-iroha1.yml index 310a0925598..8b20b419c66 100644 --- a/.github/workflows/build-iroha1.yml +++ b/.github/workflows/build-iroha1.yml @@ -359,6 +359,7 @@ jobs: with: images: ${{ env.DOCKERHUB_ORG }}/iroha-builder tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=raw,value=${{env.dockertag}} type=ref,event=branch type=ref,event=pr @@ -375,6 +376,7 @@ jobs: id: meta_ghcr with: tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=raw,value=${{env.dockertag}} type=ref,event=branch type=ref,event=pr From 5e680093869a1b41dadd7ff06fd77ef64873de6b Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 17 Apr 2024 14:15:00 +0300 Subject: [PATCH 3/4] Fix docker image tags for iroha1-main branch Signed-off-by: safinsaf --- .github/build-iroha1.src.yml | 1 + .github/workflows/build-iroha1.yml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/build-iroha1.src.yml b/.github/build-iroha1.src.yml index 00ec6bfcecc..3a89bda088b 100644 --- a/.github/build-iroha1.src.yml +++ b/.github/build-iroha1.src.yml @@ -860,6 +860,7 @@ jobs: images: | ${{ env.DOCKERHUB_ORG }}/${{ env.IMAGE_NAME }}${{ env._uses_suffix }} tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=ref,event=branch type=ref,event=pr type=ref,event=tag diff --git a/.github/workflows/build-iroha1.yml b/.github/workflows/build-iroha1.yml index 8b20b419c66..14d061f78e9 100644 --- a/.github/workflows/build-iroha1.yml +++ b/.github/workflows/build-iroha1.yml @@ -1567,6 +1567,7 @@ jobs: images: | ${{ env.DOCKERHUB_ORG }}/${{ env.IMAGE_NAME }}${{ env._uses_suffix }} tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=ref,event=branch type=ref,event=pr type=ref,event=tag @@ -1579,6 +1580,7 @@ jobs: id: meta_ghcr with: tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=ref,event=branch type=ref,event=pr type=ref,event=tag @@ -1743,6 +1745,7 @@ jobs: images: | ${{ env.DOCKERHUB_ORG }}/${{ env.IMAGE_NAME }}${{ env._uses_suffix }} tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=ref,event=branch type=ref,event=pr type=ref,event=tag @@ -1755,6 +1758,7 @@ jobs: id: meta_ghcr with: tags: | + type=raw,value=main,enable=${{ github.ref == format('refs/heads/{0}', 'iroha1-main') }} type=ref,event=branch type=ref,event=pr type=ref,event=tag From 726d206e4620ba1e5ff9c3fcdd4ef31dc190170b Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 17 Apr 2024 16:35:28 +0300 Subject: [PATCH 4/4] Add burrow to iroha1 CI Signed-off-by: safinsaf --- .github/build-iroha1.src.yml | 4 ++-- .github/workflows/build-iroha1.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/build-iroha1.src.yml b/.github/build-iroha1.src.yml index 3a89bda088b..6837927d7b0 100644 --- a/.github/build-iroha1.src.yml +++ b/.github/build-iroha1.src.yml @@ -208,10 +208,10 @@ jobs: true else #echo >/tmp/comment_body "/build debug; /build ubuntu release debug normal" - echo >/tmp/comment_body "/build ubuntu debug release normal gcc-10"$'\n' "/build macos debug clang" + echo >/tmp/comment_body "/build ubuntu debug release normal burrow gcc-10"$'\n' "/build macos debug clang" fi ;; push) commit_message_body_build_spec >/tmp/comment_body || { - echo "/build ubuntu debug release normal gcc-10" + echo "/build ubuntu debug release normal burrow gcc-10" } >/tmp/comment_body ;; workflow_dispatch) echo >/tmp/comment_body "${{github.event.inputs.build_spec}}" ;; *) echo >&2 "::error::Unexpected event"; false ;; diff --git a/.github/workflows/build-iroha1.yml b/.github/workflows/build-iroha1.yml index 14d061f78e9..996e338455b 100644 --- a/.github/workflows/build-iroha1.yml +++ b/.github/workflows/build-iroha1.yml @@ -223,10 +223,10 @@ jobs: true else #echo >/tmp/comment_body "/build debug; /build ubuntu release debug normal" - echo >/tmp/comment_body "/build ubuntu debug release normal gcc-10"$'\n' "/build macos debug clang" + echo >/tmp/comment_body "/build ubuntu debug release normal burrow gcc-10"$'\n' "/build macos debug clang" fi ;; push) commit_message_body_build_spec >/tmp/comment_body || { - echo "/build ubuntu debug release normal gcc-10" + echo "/build ubuntu debug release normal burrow gcc-10" } >/tmp/comment_body ;; workflow_dispatch) echo >/tmp/comment_body "${{github.event.inputs.build_spec}}" ;; *) echo >&2 "::error::Unexpected event"; false ;;