From f22ffb45e54384ae75a6a15405d40aa3d50517c0 Mon Sep 17 00:00:00 2001 From: mplesha Date: Sun, 9 Jul 2023 10:52:21 +0300 Subject: [PATCH 1/6] Add .github/pull_request_template.md --- .github/pull_request_template.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..3b9d4b5 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,9 @@ + ## Describe your changes + + ## Issue ticket number and link + + ## Checklist before requesting a review + - [ ] I have performed a self-review of my code + - [ ] If it is a core feature, I have added thorough tests + - [ ] Do we need to implement analytics? + - [ ] Will this be part of a product update? If yes, please write one phrase about this update From 66bbc2519f448717a8ba8464c6d00f332039ee11 Mon Sep 17 00:00:00 2001 From: mplesha Date: Wed, 10 Apr 2024 12:50:44 +0300 Subject: [PATCH 2/6] Update ruby.yml --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 10bfe13..49b3e6b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -30,7 +30,7 @@ jobs: with: app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Add outside users to organization run: | users=$(curl -L -s \ From c5ee9b4badb10cf5d47ed6f6bbf993db50060b56 Mon Sep 17 00:00:00 2001 From: mplesha Date: Wed, 18 Sep 2024 22:22:11 +0300 Subject: [PATCH 3/6] Update ruby.yml --- .github/workflows/ruby.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 49b3e6b..31cda7e 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Install my-app token id: my-app - uses: getsentry/action-github-app-token@v2 + uses: getsentry/action-github-app-token@v3 with: app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} From b9d4f47e234f19b8ceb3e50ad7375edd819a13c9 Mon Sep 17 00:00:00 2001 From: online-marathon <61456363+online-marathon@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:52:31 +0200 Subject: [PATCH 4/6] Update script_test.rb --- .github/tests/test/script_test.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index d2858e4..3394c8f 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -33,13 +33,15 @@ def test_main_present end def test_main_protected - actual = @obj.branch_protected?('main') - assert(actual, 'Branch main is not protected') + classic_protected = @obj.branch_protected?('main') + ruleset_protected = @obj.branch_ruleset_protected?('main') + assert(classic_protected || ruleset_protected, 'Branch main is not protected') end def test_develop_present - actual = @obj.branch_exist?('develop') - assert(actual, 'Branch develop is not present') + classic_protected = @obj.branch_protected?('develop') + ruleset_protected = @obj.branch_ruleset_protected?('develop') + assert(classic_protected || ruleset_protected, 'Branch develop is not present') end def test_develop_protected From 3ee1bfa261accb81b4bccf435843129b7b9efaa4 Mon Sep 17 00:00:00 2001 From: online-marathon <61456363+online-marathon@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:54:50 +0200 Subject: [PATCH 5/6] Update script_test.rb --- .github/tests/test/script_test.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 3394c8f..d2858e4 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -33,15 +33,13 @@ def test_main_present end def test_main_protected - classic_protected = @obj.branch_protected?('main') - ruleset_protected = @obj.branch_ruleset_protected?('main') - assert(classic_protected || ruleset_protected, 'Branch main is not protected') + actual = @obj.branch_protected?('main') + assert(actual, 'Branch main is not protected') end def test_develop_present - classic_protected = @obj.branch_protected?('develop') - ruleset_protected = @obj.branch_ruleset_protected?('develop') - assert(classic_protected || ruleset_protected, 'Branch develop is not present') + actual = @obj.branch_exist?('develop') + assert(actual, 'Branch develop is not present') end def test_develop_protected From 9fc07b20276a08a7d9ee131008f50bc9529b1173 Mon Sep 17 00:00:00 2001 From: mplesha Date: Thu, 30 Jan 2025 15:55:00 +0200 Subject: [PATCH 6/6] Update script_test.rb --- .github/tests/test/script_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 81b6772..5c3a028 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -98,7 +98,7 @@ def test_without_approval_main end def test_approve_from_user - user_name = 'online-marathon' + user_name = 'softservedata' classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"] pull_request_rulesets_rules = @obj.get_branch_ruleset('main') rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review')