#v0.17-llm.1

1 messages · Page 1 of 1 (latest)

proven orbit
#

First: rebasing on main...

#

@dense tangle git rebase main --rebase-merges has some (slight conflicts):

lilac mirage
#

SGTM!

proven orbit
# 
@@@ -286,6 -290,13 +289,16 @@@ func (e *DaggerEngine) Publish
        // +optional
        registryPassword *dagger.Secret,
  ) error {
++<<<<<<< HEAD
++=======
+       for _, t := range tag {
+               if !preRelease && semver.IsValid(t) {
+                       tag = append(tag, "latest")
+                       break
+               }
+       }
+
++>>>>>>> e12b9fe30 (DO NOT MERGE)
        // collect all the targets that we are trying to build together, along with
        // where they need to go to
        targetResults := make([]struct {
diff --cc releaser/main.go
index 7416e86fa,792947846..000000000
--- a/releaser/main.go
+++ b/releaser/main.go
@@@ -218,14 -204,9 +220,20 @@@ func (r *Releaser) Publish
        }
        report.Artifacts = append(report.Artifacts, artifact)

++<<<<<<< HEAD
 +      if report.hasErrors() {
 +              // early-exit if engine / cli could not Publish
 +              return &report, nil
 +      }
 +
 +      isPrerelease := semver.IsValid(version) && semver.Prerelease(version) != ""
 +      if isPrerelease {
 +              // early-exit if this is a pre-release
++=======
+       if preRelease || report.hasErrors() {
+               // early-exit if this is a pre-release
+               // OR engine / cli could not Publish
++>>>>>>> e12b9fe30 (DO NOT MERGE)
                return &report, nil
        }
lilac mirage
#

Will check back in on this in 15 mins or so

proven orbit
#

Seems release-related

lilac mirage
#

I know what it is. Can you abort the rebase?

#

I will drop the problematic commit & force push so that you can try the rebase again.

#

@proven orbit am I good to force push to llm?

proven orbit
#

Yes if you have all the commits 🙂

#

Go for it

#

@dense tangle ok with you?

lilac mirage
#

I do.

dense tangle
#

yep

lilac mirage
#

ok

proven orbit
dense tangle
#

@lilac mirage just be sure to --rebase-merges

#

otherwise the two merged PR branches will get inlined into the llm branch

lilac mirage
#

ok. aborted my rebase.

#

rebasing again now

#

ok, I'm getting a bunch of conflicts coming from merges.

#

jumping into team @dense tangle

proven orbit
#

@dense tangle @latent iron if we wanted to merge Helder's "bleeding edge shell" branch into llm (filesystme navigation; shell from dagger root command; etc) is that something we could sustain without going insane?

dense tangle
proven orbit
#

as discussed live: we're not going to merge that shell branch. But will eagerly waiti for it to merge in main 🙂

proven orbit
#

Update: publish is underway. We hit a CI issue during publish... @lilac mirage fixed it and is helping me re-publish

lilac mirage
#

can you please review & merge https://github.com/dagger/dagger/pull/9654 ? cc @dense tangle @halcyon iris @proven orbit

after, please merge main into the llm branch.

once that is done, publishing new release should be just a matter of git tagging & pushing.

#

Thanks @dense tangle ! Merged now.

#

Want to merge main into llm @dense tangle ?

dense tangle
#

go for it - should be a clean merge now, I already pushed my merge from ~1hr ago

lilac mirage
#

Then, when you're done with the shell rebases / merges, maybe tag v0.17.0-llm.2 ?

lilac mirage
#

I don't think that there are any changes which are worth packaging as a new release just yet, but DM me in case you do it @dense tangle in the next hour and something doesn't work as expected.

proven orbit
#

thank you @lilac mirage ! we will cut llm.2 as soon as @wooden crest merges anthropic support

wooden crest
#

@dense tangle, just merged the Anthropic PR to the llm branch

dense tangle
#

ah cool, was just testing it (trying to - stupid anthropic org setup is confusing)

wooden crest
#

Oh shoot -- and I made a mistake and forgot the signoff --' so the DCO bot is complaining

wooden crest
dense tangle
#

np! it works

image.png
wooden crest
# dense tangle np! it works

I'm unsure on how to fix that signoff issue on this branch, just for this commit -- as it's part of the dagger repo ; don't want to force push .. ?

dense tangle
#

force push is fine as long as you give a heads up

wooden crest
dense tangle
#

poor thing: {"type":"error","error":{"details":null,"type":"overloaded_error","message":"Overloaded"}

wooden crest