From d92d29592824414f7b01cf4ea5b5773b0bda0c38 Mon Sep 17 00:00:00 2001 From: safinsaf <45899673+safinsaf@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:48:46 +0300 Subject: [PATCH] Feature/dops 3159/ci docker main (#4428) * Try fix gcc-10 push Signed-off-by: safinsaf * Try remove iroha suffix on docker tags Signed-off-by: safinsaf --------- Signed-off-by: safinsaf --- .github/build-iroha1-fork.src.yml | 2 +- .github/build-iroha1.src.yml | 2 +- .github/workflows/build-iroha1-fork.yml | 10 +++++----- .github/workflows/build-iroha1.yml | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/build-iroha1-fork.src.yml b/.github/build-iroha1-fork.src.yml index d27aba0bd0c..a5d10f05086 100644 --- a/.github/build-iroha1-fork.src.yml +++ b/.github/build-iroha1-fork.src.yml @@ -469,7 +469,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - &step_artifact_irohad name: Upload artifact irohad diff --git a/.github/build-iroha1.src.yml b/.github/build-iroha1.src.yml index 6501a6dc97b..9a8ce38ec67 100644 --- a/.github/build-iroha1.src.yml +++ b/.github/build-iroha1.src.yml @@ -549,7 +549,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - &step_artifact_irohad name: Upload artifact irohad diff --git a/.github/workflows/build-iroha1-fork.yml b/.github/workflows/build-iroha1-fork.yml index 8a75d8807fa..44348e9926f 100644 --- a/.github/workflows/build-iroha1-fork.yml +++ b/.github/workflows/build-iroha1-fork.yml @@ -485,7 +485,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Upload artifact irohad uses: actions/upload-artifact@v2 @@ -764,7 +764,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Upload artifact irohad uses: actions/upload-artifact@v2 @@ -1065,7 +1065,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Upload artifact irohad uses: actions/upload-artifact@v2 @@ -1367,7 +1367,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Download artifact uses: actions/download-artifact@v2 @@ -1536,7 +1536,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Download artifact uses: actions/download-artifact@v2 diff --git a/.github/workflows/build-iroha1.yml b/.github/workflows/build-iroha1.yml index 8c3c2028184..b453060918f 100644 --- a/.github/workflows/build-iroha1.yml +++ b/.github/workflows/build-iroha1.yml @@ -604,7 +604,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Upload artifact irohad uses: actions/upload-artifact@v2 @@ -890,7 +890,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Upload artifact irohad uses: actions/upload-artifact@v2 @@ -1205,7 +1205,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Upload artifact irohad uses: actions/upload-artifact@v2 @@ -1537,7 +1537,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Download artifact uses: actions/download-artifact@v2 @@ -1713,7 +1713,7 @@ jobs: _os=${OS:+-$OS} _cc=${cc:+-$cc} _build_type=${build_type:+-$build_type} _uses=${uses:+-$uses} echo >>$GITHUB_ENV ARTIFACT_SUFFIX=$_os$_cc$_build_type$_uses echo >>$GITHUB_ENV _uses_suffix=$_uses - echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc9 && echo $_cc) + echo >>$GITHUB_ENV _compiler_suffix=$(test $cc != gcc10 && echo $_cc) echo >>$GITHUB_ENV _debug_suffix=$(test "$build_type" = dbg && echo -debug || true) - name: Download artifact uses: actions/download-artifact@v2