build: fix setting env var, temp early exit

This commit is contained in:
Péter Szilágyi 2023-02-20 09:56:03 +02:00
parent 2166c86041
commit e1e2781105
2 changed files with 2 additions and 1 deletions

View File

@ -721,6 +721,7 @@ func doDebianSource(cmdline []string) {
if *upload != "" { if *upload != "" {
ppaUpload(*workdir, *upload, *sshUser, []string{source, dsc, changes, buildinfo}) ppaUpload(*workdir, *upload, *sshUser, []string{source, dsc, changes, buildinfo})
} }
return
} }
} }
} }

View File

@ -20,7 +20,7 @@ override_dh_auto_build:
# We're also shipping the bootstrapper as of Go 1.20 as it had minimum version # We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
# requirements opposed to older versions of Go. # requirements opposed to older versions of Go.
(mv .goboot ../ && cd ../.goboot/src && ./make.bash) (mv .goboot ../ && cd ../.goboot/src && ./make.bash)
(cd ../.goboot/bin && export GOROOT_BOOTSTRAP=`pwd`) export GOROOT_BOOTSTRAP=`pwd`/../.goboot/bin
(mv .go ../ && cd ../.go/src && ./make.bash) (mv .go ../ && cd ../.go/src && ./make.bash)
# We can't download external go modules within Launchpad, so we're shipping the # We can't download external go modules within Launchpad, so we're shipping the