Skip to content

Commit f03dccb

Browse files
authored
handle repo not found (#1648)
1 parent 95f8246 commit f03dccb

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/next_deploy.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ on:
33
push:
44
branches:
55
- develop # change to main if needed
6-
- fix/cli-error-reporting
7-
86
jobs:
97
deploy:
108
name: Deploy app

next/controllers/github.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/base64"
66
"encoding/json"
7+
"errors"
78
"fmt"
89
"github.com/diggerhq/digger/backend/segment"
910
"github.com/diggerhq/digger/ee/cli/pkg/utils"
@@ -12,6 +13,7 @@ import (
1213
"github.com/diggerhq/digger/next/ci_backends"
1314
"github.com/diggerhq/digger/next/model"
1415
"github.com/diggerhq/digger/next/services"
16+
"gorm.io/gorm"
1517
"log"
1618
"math/rand"
1719
"net/http"
@@ -279,8 +281,12 @@ func createOrGetDiggerRepoForGithubRepo(ghRepoFullName string, ghRepoOrganisatio
279281
repo, err := dbmodels.DB.GetRepo(orgId, diggerRepoName)
280282

281283
if err != nil {
282-
log.Printf("Error fetching repo: %v", err)
283-
return nil, nil, err
284+
if errors.Is(err, gorm.ErrRecordNotFound) {
285+
log.Printf("repo not found, will proceed with repo creation")
286+
} else {
287+
log.Printf("Error fetching repo: %v", err)
288+
return nil, nil, err
289+
}
284290
}
285291

286292
if repo != nil {
@@ -626,7 +632,7 @@ func ConvertJobsToDiggerJobs(jobType orchestrator_scheduler.DiggerCommand, vcsTy
626632
}
627633

628634
log.Printf("marshalledJobsMap: %v\n", marshalledJobsMap)
629-
635+
630636
batch, err := dbmodels.DB.CreateDiggerBatch(organisationId, vcsType, githubInstallationId, repoOwner, repoName, repoFullName, prNumber, diggerConfigStr, branch, jobType, &commentId, gitlabProjectId)
631637
if err != nil {
632638
return nil, nil, fmt.Errorf("failed to create batch: %v", err)

0 commit comments

Comments
 (0)