chore: restore rebase unintended changes

starkware-libs · Oct 7, 2024 · 3b10658 · 3b10658
1 parent 04011fe
commit 3b10658
Show file tree

Hide file tree

Showing 10 changed files with 9,568 additions and 5,708 deletions.
diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml
@@ -39,11 +39,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
-# On PR events, cancel existing CI runs on this same PR for this workflow.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 jobs:
   run-regression-tests:
     runs-on: starkware-ubuntu-latest-medium

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,11 +18,7 @@ on:
 
 # On PR events, cancel existing CI runs on this same PR for this workflow.
 concurrency:
-<<<<<<< HEAD
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
-=======
-  group: ${{ github.workflow }}-${{ github.ref }}
->>>>>>> df3f7106c (fix: restore concurrency in main workflow)
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:

diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml
@@ -2,9 +2,9 @@ name: Papyrus-Nightly-Tests
 # We run gateway_integration_test at different times, to avoid a nonce race between parallel runs.
 on:
   schedule:
-    - cron: '30 22 * * *' # Uses ubuntu runner.
-    - cron: '30 0 * * *' # Uses macos runner.
-  workflow_dispatch: # Uses ubuntu runner.
+    - cron: '30 22 * * *'  # Uses ubuntu runner.
+    - cron: '30 0 * * *'  # Uses macos runner.
+  workflow_dispatch:  # Uses ubuntu runner.
 
 jobs:
   GW-integration-test-ubuntu: