d-bis/CurrenciCombo
4
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix(ci): remove orphan <<<<<<< HEAD merge-conflict markers in ci.yml #1

Open
nsatoshi wants to merge 1 commits from devin/1776555011-fix-ci-conflict-markers into main
pull from: devin/1776555011-fix-ci-conflict-markers
merge into: d-bis:main
Conversation 0 Commits 1 Files Changed 1 -7
nsatoshi commented 2026-04-18 23:30:54 +00:00
Owner
Copy Link

What

Removes the seven orphan <<<<<<< HEAD lines in .github/workflows/ci.yml that were left behind by a broken merge resolution.

Why

Each <<<<<<< HEAD sits directly after a steps: line with no matching ======= / >>>>>>> counterpart, so the file is not valid YAML and GitHub Actions cannot parse the workflow. Until this is cleaned up, CI never runs on any push or PR in this repo.

Evidence

Before (snippet):

  frontend-lint:
    name: Frontend Lint
    runs-on: ubuntu-latest
    steps:
<<<<<<< HEAD
      - uses: actions/checkout@v5
      - uses: actions/setup-node@v6

After: orphan line deleted; workflow steps otherwise unchanged.

Verified locally:

python3 -c "import yaml; y=yaml.safe_load(open('.github/workflows/ci.yml')); \
  print(list(y['jobs'].keys()))"
# -> ['frontend-lint', 'frontend-type-check', 'frontend-build', 'frontend-e2e',
#     'orchestrator-build', 'contracts-compile', 'contracts-test']

Full repo scan confirmed ci.yml was the only file with real conflict markers — the ==== rows in scripts/*.sh are decorative banner output, not merge markers:

grep -rn '^<<<<<<< \|^>>>>>>> ' --include='*.yml' --include='*.yaml' \
     --include='*.ts' --include='*.tsx' --include='*.js' \
     --include='*.sh' --include='*.ps1' .
# -> only matches in .github/workflows/ci.yml (fixed here)

Scope

Workflow-only change. 1 file, 7 deletions, zero logic changes. Does not touch webapp/ (broken gitlink), orchestrator/, or contracts/.

Not in this PR (tracked separately)

  • webapp/ is a gitlink (160000 dac160403d…) with no .gitmodules and the target commit is not in repo history. Needs to be rehydrated or git rm'd — needs a decision from @defiQUG on where the real webapp source lives.
  • contracts/ npm run compile currently fails with TS5109 moduleResolution mismatch in hardhat.config.ts. Separate fix.

Requested by @defiQUG as part of reviewing the Devin env config for this repo.

## What Removes the seven orphan `<<<<<<< HEAD` lines in `.github/workflows/ci.yml` that were left behind by a broken merge resolution. ## Why Each `<<<<<<< HEAD` sits directly after a `steps:` line with **no matching `=======` / `>>>>>>>` counterpart**, so the file is not valid YAML and GitHub Actions cannot parse the workflow. Until this is cleaned up, CI never runs on any push or PR in this repo. ## Evidence Before (snippet): ```yaml frontend-lint: name: Frontend Lint runs-on: ubuntu-latest steps: <<<<<<< HEAD - uses: actions/checkout@v5 - uses: actions/setup-node@v6 ``` After: orphan line deleted; workflow steps otherwise unchanged. Verified locally: ``` python3 -c "import yaml; y=yaml.safe_load(open('.github/workflows/ci.yml')); \ print(list(y['jobs'].keys()))" # -> ['frontend-lint', 'frontend-type-check', 'frontend-build', 'frontend-e2e', # 'orchestrator-build', 'contracts-compile', 'contracts-test'] ``` Full repo scan confirmed ci.yml was the only file with real conflict markers — the `====` rows in `scripts/*.sh` are decorative banner output, not merge markers: ``` grep -rn '^<<<<<<< \|^>>>>>>> ' --include='*.yml' --include='*.yaml' \ --include='*.ts' --include='*.tsx' --include='*.js' \ --include='*.sh' --include='*.ps1' . # -> only matches in .github/workflows/ci.yml (fixed here) ``` ## Scope Workflow-only change. 1 file, 7 deletions, zero logic changes. Does not touch `webapp/` (broken gitlink), `orchestrator/`, or `contracts/`. ## Not in this PR (tracked separately) - `webapp/` is a gitlink (`160000 dac160403d…`) with no `.gitmodules` and the target commit is not in repo history. Needs to be rehydrated or `git rm`'d — needs a decision from @defiQUG on where the real webapp source lives. - `contracts/` `npm run compile` currently fails with `TS5109 moduleResolution mismatch` in `hardhat.config.ts`. Separate fix. --- Requested by @defiQUG as part of reviewing the Devin env config for this repo.
nsatoshi added 1 commit 2026-04-18 23:30:54 +00:00
fix(ci): remove orphan <<<<<<< HEAD merge-conflict markers in ci.yml
Some checks failed
CI / Frontend Lint (pull_request) Failing after 1m13s
Details
CI / Frontend Type Check (pull_request) Failing after 7s
Details
CI / Frontend Build (pull_request) Failing after 7s
Details
CI / Frontend E2E Tests (pull_request) Failing after 7s
Details
CI / Orchestrator Build (pull_request) Failing after 7s
Details
CI / Contracts Compile (pull_request) Failing after 6s
Details
CI / Contracts Test (pull_request) Failing after 6s
Details
Code Quality / SonarQube Analysis (pull_request) Failing after 7s
Details
Code Quality / Code Quality Checks (pull_request) Failing after 10s
Details
Security Scan / Dependency Vulnerability Scan (pull_request) Failing after 3s
Details
Security Scan / OWASP ZAP Scan (pull_request) Failing after 6s
Details
66eef8b384 
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>
Some checks failed
CI / Frontend Lint (pull_request) Failing after 1m13s
Details
CI / Frontend Type Check (pull_request) Failing after 7s
Details
CI / Frontend Build (pull_request) Failing after 7s
Details
CI / Frontend E2E Tests (pull_request) Failing after 7s
Details
CI / Orchestrator Build (pull_request) Failing after 7s
Details
CI / Contracts Compile (pull_request) Failing after 6s
Details
CI / Contracts Test (pull_request) Failing after 6s
Details
Code Quality / SonarQube Analysis (pull_request) Failing after 7s
Details
Code Quality / Code Quality Checks (pull_request) Failing after 10s
Details
Security Scan / Dependency Vulnerability Scan (pull_request) Failing after 3s
Details
Security Scan / OWASP ZAP Scan (pull_request) Failing after 6s
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin devin/1776555011-fix-ci-conflict-markers:devin/1776555011-fix-ci-conflict-markers
git checkout devin/1776555011-fix-ci-conflict-markers
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
70rn4710n A.r.yavari SEG nsatoshi
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: d-bis/CurrenciCombo#1
Delete Branch "devin/1776555011-fix-ci-conflict-markers"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?