From 8137d65ead28de6ee6dbc4b1cd497781fe7e0b16 Mon Sep 17 00:00:00 2001 From: BAStos525 <66615487+BAStos525@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:40:49 +0300 Subject: [PATCH] [ci]: Update iroha2 main branch workflows triggers (#4452) Signed-off-by: BAStos525 --- .github/workflows/iroha2-dev-pr-static.yml | 2 +- .github/workflows/iroha2-dev-pr-title.yml | 2 +- .github/workflows/iroha2-dev-pr-wasm.yaml | 2 +- .github/workflows/iroha2-dev-pr.yml | 2 +- .github/workflows/iroha2-dev.yml | 2 +- .github/workflows/iroha2-no-incorrect-image.yml | 12 ++++++------ .../{iroha2-dev-pr-ui.yml => iroha2-pr-ui.yml} | 4 ++-- .github/workflows/iroha2-release-pr.yml | 2 +- .github/workflows/iroha2-release.yml | 6 ++---- 9 files changed, 16 insertions(+), 18 deletions(-) rename .github/workflows/{iroha2-dev-pr-ui.yml => iroha2-pr-ui.yml} (91%) diff --git a/.github/workflows/iroha2-dev-pr-static.yml b/.github/workflows/iroha2-dev-pr-static.yml index 7ae3aa0b6e6..6e334c61752 100644 --- a/.github/workflows/iroha2-dev-pr-static.yml +++ b/.github/workflows/iroha2-dev-pr-static.yml @@ -2,7 +2,7 @@ name: I2::Dev::Static on: pull_request: - branches: [iroha2-dev] + branches: [main] paths: - '**.rs' - '**.json' diff --git a/.github/workflows/iroha2-dev-pr-title.yml b/.github/workflows/iroha2-dev-pr-title.yml index 2c698821abc..04bb36f42c0 100644 --- a/.github/workflows/iroha2-dev-pr-title.yml +++ b/.github/workflows/iroha2-dev-pr-title.yml @@ -2,7 +2,7 @@ name: I2::Dev::Title on: pull_request_target: - branches: [iroha2-dev] + branches: [main] types: [opened, edited, reopened] jobs: diff --git a/.github/workflows/iroha2-dev-pr-wasm.yaml b/.github/workflows/iroha2-dev-pr-wasm.yaml index e4efaf00a0e..e4a0b975e26 100644 --- a/.github/workflows/iroha2-dev-pr-wasm.yaml +++ b/.github/workflows/iroha2-dev-pr-wasm.yaml @@ -2,7 +2,7 @@ name: I2::Dev::Wasm on: pull_request: - branches: [iroha2-dev] + branches: [main] paths: - 'data_model/**.rs' - 'data_model/**.yml' diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml index 0b6d47e7428..c83654954f3 100644 --- a/.github/workflows/iroha2-dev-pr.yml +++ b/.github/workflows/iroha2-dev-pr.yml @@ -2,7 +2,7 @@ name: I2::Dev::Tests on: pull_request: - branches: [iroha2-dev] + branches: [main] paths: - '**.rs' - '**.json' diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml index 9d72efdf786..cf2360a60ba 100644 --- a/.github/workflows/iroha2-dev.yml +++ b/.github/workflows/iroha2-dev.yml @@ -2,7 +2,7 @@ name: I2::Dev::Publish on: push: - branches: [iroha2-dev] + branches: [main] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/iroha2-no-incorrect-image.yml b/.github/workflows/iroha2-no-incorrect-image.yml index fbc6aa228de..f6be6f5f5c4 100644 --- a/.github/workflows/iroha2-no-incorrect-image.yml +++ b/.github/workflows/iroha2-no-incorrect-image.yml @@ -3,8 +3,8 @@ name: I2::CI::check_for_incorrect_images on: push: branches: - - iroha2-dev - - iroha2-stable + - main + - stable jobs: check: @@ -17,9 +17,9 @@ jobs: - uses: actions/checkout@v3 - name: Install dependencies run: pip install -r .github/scripts/ci_test/requirements.txt --no-input - - name: Check containers on iroha2-stable branch - if: github.base_ref == 'iroha2-stable' + - name: Check containers on iroha2 stable branch + if: github.base_ref == 'stable' run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha2:stable -- docker-compose*.yml - - name: Check containers on iroha2-dev branch - if: github.base_ref == 'iroha2-dev' + - name: Check containers on iroha2 main branch + if: github.base_ref == 'main' run: python .github/scripts/ci_test/ci_image_scan.py --allow iroha2:dev -- docker-compose*.yml diff --git a/.github/workflows/iroha2-dev-pr-ui.yml b/.github/workflows/iroha2-pr-ui.yml similarity index 91% rename from .github/workflows/iroha2-dev-pr-ui.yml rename to .github/workflows/iroha2-pr-ui.yml index ef5521a23e4..69960bb5a9a 100644 --- a/.github/workflows/iroha2-dev-pr-ui.yml +++ b/.github/workflows/iroha2-pr-ui.yml @@ -1,8 +1,8 @@ -name: I2::Dev::Tests::UI +name: I2::Tests::UI on: pull_request: - branches: [iroha2-dev, iroha2-stable, iroha2-lts] + branches: [main, stable, lts] paths: - '**/derive/**.rs' - '**/tests/ui.rs' diff --git a/.github/workflows/iroha2-release-pr.yml b/.github/workflows/iroha2-release-pr.yml index c51e737b3f0..f224cbacabc 100644 --- a/.github/workflows/iroha2-release-pr.yml +++ b/.github/workflows/iroha2-release-pr.yml @@ -2,7 +2,7 @@ name: I2::Release::Tests on: pull_request: - branches: [ iroha2-stable, iroha2-lts ] + branches: [stable, lts] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml index b2b9a8c48b8..af2e5e482a0 100644 --- a/.github/workflows/iroha2-release.yml +++ b/.github/workflows/iroha2-release.yml @@ -2,7 +2,7 @@ name: I2::Release::Publish on: push: - branches: [iroha2-stable, iroha2-lts] + branches: [stable, lts] env: CARGO_TERM_COLOR: always @@ -20,9 +20,7 @@ jobs: install: true - name: Get tag from branch name run: | - BRANCH=${{ github.ref_name }} - PREFIX='iroha2-' - TAG=${BRANCH#$PREFIX} + TAG=${{ github.ref_name }} echo "TAG=$TAG" >>$GITHUB_ENV - name: Get the release from a branch name run: |