[changelog] updated changelog

Author: roboquat

.werft/changelog.yaml

@@ -34,7 +34,7 @@ pod:
         set -Eeuo pipefail
         export GITHUB_TOKEN=$(echo $GITHUB_TOKEN | xargs)
         export GIT_REF={{ .Repository.Ref }}
-        export GIT_BRANCH=main #${GIT_REF/refs\/heads\//}
+        export GIT_BRANCH=${GIT_REF/refs\/heads\//}
         export PR_BRANCH=$(date '+rq/changelog_%Y%m%d%H%M')
         git checkout -b $PR_BRANCH
         /app/changelog update -t $GITHUB_TOKEN -o {{ .Repository.Owner }} -r {{ .Repository.Repo }} -b $GIT_BRANCH

dev/changelog/pullrequest.go

@@ -88,11 +88,7 @@ var pullRequestCommand = &cobra.Command{
 		}
 		logger.WithField("url", pr.URL).WithField("pr", pr.Number).Info("PR approval comment added")
 
-<<<<<<< HEAD
-		labels, _, err := client.Issues.AddLabelsToIssue(context, prOpts.Org, prOpts.Repo, *pr.Number, []string{"lgtm"})
-=======
 		labels, _, err := client.Issues.AddLabelsToIssue(context, prOpts.Org, prOpts.Repo, *pr.Number, []string{"lgtm", "approved"})
->>>>>>> 1d9688eb ([changelog] sort release notes by merge date and wait for prow to add labels)
 		if err != nil {
 			logger.WithError(err).Fatal("Error setting labels")
 		}

dev/changelog/update.go

@@ -151,12 +151,6 @@ func GetReleaseNotes(c *github.Client, opts *UpdateOptions, lastPrNr int, lastPr
 			Page: 1,
 		},
 	}
-<<<<<<< HEAD
-	defer sort.SliceStable(releaseNotes, func(i, j int) bool {
-		return releaseNotes[i].MergedAt.After(releaseNotes[j].MergedAt)
-	})
-=======
->>>>>>> 1d9688eb ([changelog] sort release notes by merge date and wait for prow to add labels)
 
 	for {
 		logger.Infof("Querying PRs from GitHub, page %d", listingOpts.ListOptions.Page)