fix(ci): remove orphan <<<<<<< HEAD merge-conflict markers in ci.yml
Some checks failed
CI / Frontend Lint (pull_request) Failing after 1m13s
CI / Frontend Type Check (pull_request) Failing after 7s
CI / Frontend Build (pull_request) Failing after 7s
CI / Frontend E2E Tests (pull_request) Failing after 7s
CI / Orchestrator Build (pull_request) Failing after 7s
CI / Contracts Compile (pull_request) Failing after 6s
CI / Contracts Test (pull_request) Failing after 6s
Code Quality / SonarQube Analysis (pull_request) Failing after 7s
Code Quality / Code Quality Checks (pull_request) Failing after 10s
Security Scan / Dependency Vulnerability Scan (pull_request) Failing after 3s
Security Scan / OWASP ZAP Scan (pull_request) Failing after 6s
Some checks failed
CI / Frontend Lint (pull_request) Failing after 1m13s
CI / Frontend Type Check (pull_request) Failing after 7s
CI / Frontend Build (pull_request) Failing after 7s
CI / Frontend E2E Tests (pull_request) Failing after 7s
CI / Orchestrator Build (pull_request) Failing after 7s
CI / Contracts Compile (pull_request) Failing after 6s
CI / Contracts Test (pull_request) Failing after 6s
Code Quality / SonarQube Analysis (pull_request) Failing after 7s
Code Quality / Code Quality Checks (pull_request) Failing after 10s
Security Scan / Dependency Vulnerability Scan (pull_request) Failing after 3s
Security Scan / OWASP ZAP Scan (pull_request) Failing after 6s
A prior merge landed with seven unresolved `<<<<<<< HEAD` lines (each sitting directly after a `steps:` line) and no matching `=======` / `>>>>>>>` counterparts, so GitHub Actions (and any other YAML parser) cannot load the workflow. Removing the orphan markers is a safe no-op for the intended workflow definition. Verified the file parses as valid YAML after the change and all seven jobs (frontend-lint, frontend-type-check, frontend-build, frontend-e2e, orchestrator-build, contracts-compile, contracts-test) are still defined. Co-Authored-By: Nakamoto, S <defi@defi-oracle.io>
This commit is contained in:
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
@@ -12,7 +12,6 @@ jobs:
|
||||
name: Frontend Lint
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
@@ -30,7 +29,6 @@ jobs:
|
||||
name: Frontend Type Check
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
@@ -48,7 +46,6 @@ jobs:
|
||||
name: Frontend Build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
@@ -71,7 +68,6 @@ jobs:
|
||||
name: Frontend E2E Tests
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
@@ -99,7 +95,6 @@ jobs:
|
||||
name: Orchestrator Build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
@@ -118,7 +113,6 @@ jobs:
|
||||
name: Contracts Compile
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
@@ -136,7 +130,6 @@ jobs:
|
||||
name: Contracts Test
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
|
||||
Reference in New Issue
Block a user