CI Fixes (#1190)

* Revert "automated duplicating imported samples modifications (#595)" This reverts commit a555894. * made main package testable, revert due to a mistake * initial test * typo fix * inherit secrets * test branch updated * possible push fix * branch name fix * branch name reverted --------- Co-authored-by: robGG1997 <[email protected]>
ChainSafe · Oct 15, 2024 · 847ac07 · 847ac07
1 parent 1fc487d
commit 847ac07
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git 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
+        git push -f origin HEAD:$branch
+      env:
+        branch: ${{ github.head_ref || github.ref_name }}
diff --git a/...hub/workflows/pre_pull_request_checks.yml → .github/workflows/pull_request_checks.yml b/...hub/workflows/pre_pull_request_checks.yml → .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
@@ -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
diff --git a/.github/workflows/pull_request_checks_main.yml 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
diff --git a/...orkflows/post_push_checks_and_commits.yml → .github/workflows/push_checks.yml b/...orkflows/post_push_checks_and_commits.yml → .github/workflows/push_checks.yml