Commit54a3715

committed

Merge branch 'main' into e2e-port

2 parentsf621b7c +064a08e commit54a3715Copy full SHA for 54a3715

File tree

+491

-590

lines changed

+491

-590

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ jobs:`
`666`	`666`	`# to main branch. We are only building this for amd64 platform. (>95% pulls`
`667`	`667`	`# are for amd64)`
`668`	`668`	`needs:changes`
`669`		`-if:needs.changes.outputs.docs-only == 'false' && !github.event.pull_request.head.repo.fork`
	`669`	`+if:github.ref == 'refs/heads/main' &&needs.changes.outputs.docs-only == 'false' && !github.event.pull_request.head.repo.fork`
`670`	`670`	`runs-on:${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' \|\| 'ubuntu-latest' }}`
`671`	`671`	`env:`
`672`	`672`	`DOCKER_CLI_EXPERIMENTAL:"enabled"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ jobs:`
`34`	`34`	`steps:`
`35`	`35`	`-name:cla`
`36`	`36`	`if:(github.event.comment.body == 'recheck' \|\| github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') \|\| github.event_name == 'pull_request_target'`
`37`		`-uses:contributor-assistant/github-action@v2.3.1`
	`37`	`+uses:contributor-assistant/github-action@v2.3.2`
`38`	`38`	`env:`
`39`	`39`	`GITHUB_TOKEN:${{ secrets.GITHUB_TOKEN }}`
`40`	`40`	`# the below token should have repo scope and must be manually added by you in the repository's secret`

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import (`
`18`	`18`
`19`	`19`	`"github.com/coder/pretty"`
`20`	`20`
`21`		`-"github.com/coder/coder/v2/buildinfo"`
`22`	`21`	`"github.com/coder/coder/v2/cli/cliui"`
`23`	`22`	`"github.com/coder/coder/v2/coderd/userpassword"`
`24`	`23`	`"github.com/coder/coder/v2/codersdk"`
`@@ -180,21 +179,11 @@ func (r RootCmd) login() serpent.Command {`
`180`	`179`	`serverURL.Scheme="https"`
`181`	`180`	`}`
`182`	`181`
`183`		`-client,err:=r.createUnauthenticatedClient(ctx,serverURL)`
	`182`	`+client,err:=r.createUnauthenticatedClient(ctx,serverURL,inv)`
`184`	`183`	`iferr!=nil {`
`185`	`184`	`returnerr`
`186`	`185`	`}`
`187`	`186`
`188`		`-// Try to check the version of the server prior to logging in.`
`189`		`-// It may be useful to warn the user if they are trying to login`
`190`		`-// on a very old client.`
`191`		`-err=r.checkVersions(inv,client,buildinfo.Version())`
`192`		`-iferr!=nil {`
`193`		`-// Checking versions isn't a fatal error so we print a warning`
`194`		`-// and proceed.`
`195`		`-_,_=fmt.Fprintln(inv.Stderr,pretty.Sprint(cliui.DefaultStyles.Warn,err.Error()))`
`196`		`-}`
`197`		`-`
`198`	`187`	`hasFirstUser,err:=client.HasFirstUser(ctx)`
`199`	`188`	`iferr!=nil {`
`200`	`189`	`returnxerrors.Errorf("Failed to check server %q for first user, is the URL correct and is coder accessible from your browser? Error - has initial user: %w",serverURL.String(),err)`

Lines changed: 0 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,33 +97,6 @@ func TestLogout(t *testing.T) {`
`97`	`97`
`98`	`98`	`<-logoutChan`
`99`	`99`	`})`
`100`		`-t.Run("NoSessionFile",func(t*testing.T) {`
`101`		`-t.Parallel()`
`102`		`-`
`103`		`-pty:=ptytest.New(t)`
`104`		`-config:=login(t,pty)`
`105`		`-`
`106`		`-// Ensure session files exist.`
`107`		`-require.FileExists(t,string(config.URL()))`
`108`		`-require.FileExists(t,string(config.Session()))`
`109`		`-`
`110`		`-err:=os.Remove(string(config.Session()))`
`111`		`-require.NoError(t,err)`
`112`		`-`
`113`		`-logoutChan:=make(chanstruct{})`
`114`		`-logout,_:=clitest.New(t,"logout","--global-config",string(config))`
`115`		`-`
`116`		`-logout.Stdin=pty.Input()`
`117`		`-logout.Stdout=pty.Output()`
`118`		`-`
`119`		`-gofunc() {`
`120`		`-deferclose(logoutChan)`
`121`		`-err=logout.Run()`
`122`		`-assert.ErrorContains(t,err,"You are not logged in. Try logging in using 'coder login'.")`
`123`		`-}()`
`124`		`-`
`125`		`-<-logoutChan`
`126`		`-})`
`127`	`100`	`t.Run("CannotDeleteFiles",func(t*testing.T) {`
`128`	`101`	`t.Parallel()`
`129`	`102`

Comments

(0)