nit

dydxprotocol · May 23, 2024 · fb5044a · fb5044a
1 parent a504483
commit fb5044a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 25 deletions.
diff --git a/.github/workflows/indexer-build-and-push-dev-staging.yml b/.github/workflows/indexer-build-and-push-dev-staging.yml
@@ -4,13 +4,8 @@ on: # yamllint disable-line rule:truthy
   push:
     branches:
       - main
-<<<<<<< HEAD
-      - 'release/[a-z]+/v0.[0-9]+.x'  # e.g. release/indexer/v0.1.x
-      - 'release/[a-z]+/v[0-9]+.x'  # e.g. release/indexer/v1.x
-=======
       - 'release/indexer/v[0-9]+.[0-9]+.x'  # e.g. release/indexer/v0.1.x
       - 'release/indexer/v[0-9]+.x'  # e.g. release/indexer/v1.x
->>>>>>> 9cb8bbae (Reduce number of new ECR images in AWS (#1548))
     # TODO(DEC-837): Customize github build and push to ECR by service with paths
 
 jobs:

diff --git a/.github/workflows/indexer-build-and-push-mainnet.yml b/.github/workflows/indexer-build-and-push-mainnet.yml
@@ -4,13 +4,8 @@ on: # yamllint disable-line rule:truthy
   push:
     branches:
       - main
-<<<<<<< HEAD
-      - 'release/[a-z]+/0.[0-9]+.x'  # e.g. release/indexer/v0.1.x
-      - 'release/[a-z]+/v[0-9]+.x'  # e.g. release/indexer/v1.x
-=======
       - 'release/indexer/v[0-9]+.[0-9]+.x'  # e.g. release/indexer/v0.1.x
       - 'release/indexer/v[0-9]+.x'  # e.g. release/indexer/v1.x
->>>>>>> 9cb8bbae (Reduce number of new ECR images in AWS (#1548))
     # TODO(DEC-837): Customize github build and push to ECR by service with paths
 
 jobs:

diff --git a/.github/workflows/indexer-build-and-push-testnet.yml b/.github/workflows/indexer-build-and-push-testnet.yml
@@ -4,13 +4,8 @@ on: # yamllint disable-line rule:truthy
   push:
     branches:
       - main
-<<<<<<< HEAD
-      - 'release/[a-z]+/v0.[0-9]+.x'  # e.g. release/indexer/v0.1.x
-      - 'release/[a-z]+/v[0-9]+.x'  # e.g. release/indexer/v1.x
-=======
       - 'release/indexer/v[0-9]+.[0-9]+.x'  # e.g. release/indexer/v0.1.x
       - 'release/indexer/v[0-9]+.x'  # e.g. release/indexer/v1.x
->>>>>>> 9cb8bbae (Reduce number of new ECR images in AWS (#1548))
     # TODO(DEC-837): Customize github build and push to ECR by service with paths
 
 jobs:

diff --git a/.github/workflows/protocol-build-and-push-snapshot.yml b/.github/workflows/protocol-build-and-push-snapshot.yml
@@ -4,13 +4,8 @@ on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - main
-<<<<<<< HEAD
-      - 'release/[a-z]+/v0.[0-9]+.x'  # e.g. release/protocol/v0.1.x
-      - 'release/[a-z]+/v[0-9]+.x'  # e.g. release/protocol/v1.x
-=======
       - 'release/protocol/v[0-9]+.[0-9]+.x'  # e.g. release/protocol/v0.1.x
       - 'release/protocol/v[0-9]+.x'  # e.g. release/protocol/v1.x
->>>>>>> 9cb8bbae (Reduce number of new ECR images in AWS (#1548))
 
 jobs:
   build-and-push-snapshot-dev:

diff --git a/.github/workflows/protocol-build-and-push.yml b/.github/workflows/protocol-build-and-push.yml
@@ -4,13 +4,8 @@ on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - main
-<<<<<<< HEAD
-      - 'release/[a-z]+/v0.[0-9]+.x'  # e.g. release/protocol/v0.1.x
-      - 'release/[a-z]+/v[0-9]+.x'  # e.g. release/protocol/v1.x
-=======
       - 'release/protocol/v[0-9]+.[0-9]+.x'  # e.g. release/protocol/v0.1.x
       - 'release/protocol/v[0-9]+.x'  # e.g. release/protocol/v1.x
->>>>>>> 9cb8bbae (Reduce number of new ECR images in AWS (#1548))
 
 jobs:
   build-and-push-dev: