handling merge conflicts - guideline

[drahnr]

In #76 it is suggested that one uses the on_failure to report i.e. merge conflicts, but that resolves only in errors regarding missing version.json

2020/06/17 07:05:47 put failed: failed to read version from path: open /tmp/build/put/git-pull-request-resource/.git/resource/version.json: no such file or directory

resource_types:
- name: pull-request
  type: registry-image
  source:
    repository: teliaoss/github-pr-resource

resources:
- name: git-pull-request-resource
  type: pull-request
  source:
    repository: drahnr/cargo-spellcheck
    access_token: ((token))

jobs:
  - name: pr-validate
    build_logs_to_retain: 10
    public: true
    serial: true
    plan:
    - put: git-pull-request-resource
      params:
        path: git-pull-request-resource
        context: meta-check
        status: pending

    - get: git-pull-request-resource
      resource: git-pull-request-resource
      trigger: true
      on_success:
        put: git-pull-request-resource
        params:
          path: git-pull-request-resource
          context: merge-conflict
          status: success
      on_failure:
        put: git-pull-request-resource
        params:
          path: git-pull-request-resource
          context: merge-conflict
          status: failure

https://ci.spearow.io/teams/main/pipelines/cargo-spellcheck/jobs/pr-validate/builds/23

[itsdalmo]

It seems you are attempting to put a status before using get on the resource, which means version.json is not populated/you get an error. Take a look at the example in the README and hopefully it should work for you 👍

[drahnr]

The issue here is, that even with

    - get: git-pull-request-resource
      resource: git-pull-request-resource
      version: every
      trigger: true
      on_success:
        put: git-pull-request-resource
        params:
          path: git-pull-request-resource
          context: merge-conflict
          status: success
      on_failure:
        put: git-pull-request-resource
        params:
          path: git-pull-request-resource
          context: merge-conflict
          status: failure

still fails with the same issue, since the get step fails - which leaves the question on how to report merge conflicts back still open.

[itsdalmo]

Ah you are right, sorry what I suggested will not work since version.json is not written to disk if any of the git operations fail along the way. This could be fixed by moving this code so its executed at the start of the get (don't see a reason why it shouldn't). Sorry for the confusion.

[drahnr]

Unfortunately I am not a go developer, working on the rust front, so I would very much appreciate if that change could be introduced without me setting up a go dev env :)

[cfryanr]

Hi @itsdalmo, I'm having the same problem as @drahnr. I can't seem to find any way to signal status back to the PR on github that CI started and failed in the case of the get step failing due to merge conflicts. Any chance this might get fixed?

[xguerin]

@gabro This is a long shot, and I apologize for commenting on a closed issue; but at this scenario ever worked? I am trying that exact same pipeline, with v0.23.0, and I am still getting that very same error. From the look of it, it seems that the output of the failed get is not kept around when invoking the on_failure step.