Skip to content

feature/community-oidc: unresolved merge conflict in openai.clj causes CI failure #1

Description

@JoeMartini

Problem

The feature/community-oidc branch has unresolved git merge conflict markers in src/metabase/metabot/self/openai.clj (around line 259), causing:

  1. Custom AI Provider CI — fails with Syntax error macroexpanding clojure.core/defn because <<<<<<< HEAD markers are parsed as Clojure code
  2. Docker build — fails during Clojure compilation for the same reason

Root Cause

When syncing upstream master into feature/community-oidc, the merge of openai.clj produced a conflict that was committed without resolution. The list-models function has <<<<<<< HEAD / ======= / >>>>>>> markers splitting two versions of the function body.

Evidence

CI log (run https://github.com/siliconflow/metabase/actions/runs/30427418833):

Syntax error macroexpanding clojure.core/defn at (metabase/metabot/self/openai.clj:259:1).
<<<<<<< - failed: vector? at: [:fn-tail :arity-1 :params]

Fix

Manually resolve the merge conflict in src/metabase/metabot/self/openai.clj, keeping the community-oidc custom provider changes while incorporating upstream updates to the list-models function.

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions