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

2026-04-18T16:30:54-07:00

nsatoshi commented

2026-04-18 16:30:54 -07:00

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 merged commit 5ea631ad2f into main

2026-04-22 10:11:21 -07:00

nsatoshi referenced this issue from a commit

2026-04-22 10:11:22 -07:00

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

nsatoshi deleted branch devin/1776555011-fix-ci-conflict-markers

2026-04-22 10:11:23 -07:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: d-bis/CurrenciCombo#1