diff --git a/.github/workflows/check_and_commit.yml b/.github/workflows/check_and_commit.yml index 4c09917c6..215e0243a 100644 --- a/.github/workflows/check_and_commit.yml +++ b/.github/workflows/check_and_commit.yml @@ -127,9 +127,10 @@ jobs: name: Coverage results for ${{ matrix.testMode }} path: ${{ steps.tests.outputs.coveragePath }} - name: Commit and Push changes - if: ${{ github.ref_name == 'dev' }} run: | git diff-index --cached --quiet HEAD || git commit -m 'Auto Commit [skip ci] - Duplicate Packages Samples - Publish DLL Dependencies' - git push -f \ No newline at end of file + git push -f origin HEAD:$branch + env: + branch: ${{ github.head_ref || github.ref_name }} \ No newline at end of file diff --git a/.github/workflows/pre_pull_request_checks.yml b/.github/workflows/pull_request_checks.yml similarity index 81% rename from .github/workflows/pre_pull_request_checks.yml rename to .github/workflows/pull_request_checks.yml index 221f52325..6a7966e1b 100644 --- a/.github/workflows/pre_pull_request_checks.yml +++ b/.github/workflows/pull_request_checks.yml @@ -1,13 +1,7 @@ -name: Merge Checks +name: Pull Request Checks on: - pull_request: - branches: - - main - - dev - types: - - labeled - - ready_for_review + workflow_call: jobs: web3_tests: diff --git a/.github/workflows/pull_request_checks_dev.yml b/.github/workflows/pull_request_checks_dev.yml new file mode 100644 index 000000000..de90a098f --- /dev/null +++ b/.github/workflows/pull_request_checks_dev.yml @@ -0,0 +1,15 @@ +name: Merge Checks + +on: + pull_request: + branches: + - dev + types: + - labeled + - ready_for_review + +jobs: + pull_reqest_checks: + name: Pull Request Checks + uses: ChainSafe/web3.unity/.github/workflows/pull_request_checks.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pull_request_checks_main.yml b/.github/workflows/pull_request_checks_main.yml new file mode 100644 index 000000000..8757cbd12 --- /dev/null +++ b/.github/workflows/pull_request_checks_main.yml @@ -0,0 +1,15 @@ +name: Merge Checks + +on: + pull_request: + branches: + - main + types: + - labeled + - ready_for_review + +jobs: + pull_reqest_checks: + name: Pull Request Checks + uses: ChainSafe/web3.unity/.github/workflows/pull_request_checks.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/post_push_checks_and_commits.yml b/.github/workflows/push_checks.yml similarity index 100% rename from .github/workflows/post_push_checks_and_commits.yml rename to .github/workflows/push_checks.yml