From ea0c04d48991f24e99589ca73d1b2370118eee7b Mon Sep 17 00:00:00 2001 From: Samuel Littley Date: Mon, 4 Nov 2024 11:37:46 +0000 Subject: [PATCH] Update Go to 1.23.2 to make puku aware of package `iter` (#135) Also, remove checked-in generated file and update .plzconfig to make it generate imports --- .github/workflows/golangci-lint.yml | 3 + .plzconfig | 7 +- ChangeLog | 4 + PUKU_VERSION | 2 +- go.mod | 2 +- knownimports/.gitignore | 3 + knownimports/BUILD | 1 + knownimports/go_root_packages | 272 ---------------------------- 8 files changed, 19 insertions(+), 275 deletions(-) create mode 100644 knownimports/.gitignore delete mode 100644 knownimports/go_root_packages diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index cf77dfb..43fa320 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,6 +15,9 @@ jobs: - uses: actions/setup-go@v2 with: go-version: "^1.23" + - name: Build go_root_packages + # This makes sure the knownimports/go_root_packages file exists as a real file for golangci-lint + run: ./pleasew build //knownimports:go_root_packages && mv $(readlink knownimports/go_root_packages) knownimports/go_root_packages - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: diff --git a/.plzconfig b/.plzconfig index 395bc2c..4c2f4ea 100644 --- a/.plzconfig +++ b/.plzconfig @@ -1,6 +1,11 @@ [parse] preloadsubincludes = ///go//build_defs:go +[build] +LinkGeneratedSources = true +DownloadLinkable = true +UpdateGitignore = true + [Plugin "go"] Target = //plugins:go ImportPath = github.com/please-build/puku @@ -19,4 +24,4 @@ Desc = Runs golangci-lint as done by our CI cmd = run //third_party/binary:golangci-lint -- run [BuildConfig] -go-version = 1.22.3 +go-version = 1.23.2 diff --git a/ChangeLog b/ChangeLog index 425a6ea..45fd39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 1.13.0 +-------------- + * Build with Go 1.23.2 to pull in new packages + Version 1.12.1 -------------- * Rename `VERSION` to `PUKU_VERSION` to allow running diff --git a/PUKU_VERSION b/PUKU_VERSION index f8f4f03..feaae22 100644 --- a/PUKU_VERSION +++ b/PUKU_VERSION @@ -1 +1 @@ -1.12.1 +1.13.0 diff --git a/go.mod b/go.mod index 55e3e8a..ed7e1d7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/please-build/puku -go 1.19 +go 1.23 require ( github.com/fsnotify/fsnotify v1.7.0 diff --git a/knownimports/.gitignore b/knownimports/.gitignore new file mode 100644 index 0000000..8be9ef7 --- /dev/null +++ b/knownimports/.gitignore @@ -0,0 +1,3 @@ + +# Entries below this point are managed by Please (DO NOT EDIT) +go_root_packages diff --git a/knownimports/BUILD b/knownimports/BUILD index b6d343e..1208488 100644 --- a/knownimports/BUILD +++ b/knownimports/BUILD @@ -5,6 +5,7 @@ genrule( srcs = ["//third_party/go:toolchain"], outs = ["go_root_packages"], cmd = f'find {root} -name "*.a" | sed -e s=^{root}/== | sed -e s="\.a\$"== > $OUT', + labels = ["codegen"], ) go_library( diff --git a/knownimports/go_root_packages b/knownimports/go_root_packages deleted file mode 100644 index eed5313..0000000 --- a/knownimports/go_root_packages +++ /dev/null @@ -1,272 +0,0 @@ -image -unicode -regexp -vendor/golang.org/x/text/unicode/norm -vendor/golang.org/x/text/unicode/bidi -vendor/golang.org/x/text/secure/bidirule -vendor/golang.org/x/text/transform -vendor/golang.org/x/sys/cpu -vendor/golang.org/x/net/http/httpguts -vendor/golang.org/x/net/http/httpproxy -vendor/golang.org/x/net/dns/dnsmessage -vendor/golang.org/x/net/nettest -vendor/golang.org/x/net/idna -vendor/golang.org/x/net/http2/hpack -vendor/golang.org/x/crypto/hkdf -vendor/golang.org/x/crypto/cryptobyte -vendor/golang.org/x/crypto/internal/poly1305 -vendor/golang.org/x/crypto/internal/alias -vendor/golang.org/x/crypto/cryptobyte/asn1 -vendor/golang.org/x/crypto/chacha20poly1305 -vendor/golang.org/x/crypto/chacha20 -index/suffixarray -debug/gosym -debug/plan9obj -debug/dwarf -debug/elf -debug/pe -debug/buildinfo -debug/macho -strings -crypto -database/sql -database/sql/driver -io/fs -io/ioutil -encoding -flag -slices -strconv -sync/atomic -compress/zlib -compress/gzip -compress/flate -compress/bzip2 -compress/lzw -path -runtime -unicode/utf8 -unicode/utf16 -plugin -regexp/syntax -cmp -errors -runtime/trace -runtime/debug -runtime/metrics -runtime/pprof -runtime/coverage -runtime/race -runtime/internal/startlinetest -runtime/internal/atomic -runtime/internal/sys -runtime/internal/math -runtime/internal/syscall -runtime/cgo -runtime/race/internal/amd64v1 -encoding/ascii85 -encoding/gob -encoding/csv -encoding/binary -encoding/base32 -encoding/xml -encoding/asn1 -encoding/json -encoding/base64 -encoding/hex -encoding/pem -text/tabwriter -text/template -text/scanner -text/template/parse -archive/zip -archive/tar -bytes -mime/multipart -mime/quotedprintable -hash -sync -time -os -os/user -os/signal -os/exec/internal/fdtest -os/exec -log/internal -log/slog -log/slog/internal -log/slog/internal/benchmarks -log/slog/internal/slogtest -log/slog/internal/buffer -log/syslog -context -html/template -net/rpc -net/netip -net/rpc/jsonrpc -net/http/cookiejar -net/http/internal -net/http/httputil -net/http/pprof -net/http/fcgi -net/http/internal/ascii -net/http/internal/testcert -net/http/cgi -net/http/httptrace -net/http/httptest -net/smtp -net/http -net/internal/socktest -net/textproto -net/url -net/mail -mime -math -net -testing/iotest -testing/quick -testing/fstest -testing/slogtest -testing/internal/testdeps -maps -hash/adler32 -hash/maphash -hash/fnv -hash/crc64 -hash/crc32 -image/color -image/color/palette -image/jpeg -image/png -image/internal/imageutil -image/draw -image/gif -io -reflect -internal/fmtsort -internal/profile -internal/types/errors -internal/goarch -internal/unsafeheader -internal/txtar -internal/bisect -internal/trace -internal/sysinfo -internal/intern -internal/xcoff -internal/obscuretestdata -internal/goos -internal/cpu -internal/itoa -internal/abi -internal/lazyregexp -internal/godebugs -internal/syscall/unix -internal/syscall/execenv -internal/coverage -internal/cfg -internal/race -internal/godebug -internal/singleflight -internal/nettrace -internal/testlog -internal/oserror -internal/testpty -internal/platform -internal/goexperiment -internal/saferio -internal/fuzz -internal/poll -internal/buildcfg -internal/zstd -internal/testenv -internal/safefilepath -internal/diff -internal/lazytemplate -internal/reflectlite -internal/dag -internal/pkgbits -internal/goversion -internal/goroot -internal/coverage/pods -internal/coverage/encodemeta -internal/coverage/encodecounter -internal/coverage/slicewriter -internal/coverage/cmerge -internal/coverage/cformat -internal/coverage/calloc -internal/coverage/stringtab -internal/coverage/decodecounter -internal/coverage/rtcov -internal/coverage/slicereader -internal/coverage/decodemeta -internal/coverage/uleb128 -internal/bytealg -reflect/internal/example2 -reflect/internal/example1 -math/bits -math/rand -math/cmplx -math/big -go/parser -go/importer -go/doc -go/build -go/constant -go/build/constraint -go/internal/gccgoimporter -go/internal/typeparams -go/internal/gcimporter -go/internal/srcimporter -go/types -go/printer -go/scanner -go/token -go/format -go/ast -go/doc/comment -bufio -expvar -embed -container/heap -container/ring -container/list -path/filepath -fmt -html -log -time/tzdata -sort -syscall -crypto/x509 -crypto/rsa -crypto/ecdh -crypto/tls -crypto/sha512 -crypto/aes -crypto/rand -crypto/des -crypto/rc4 -crypto/x509/pkix -crypto/sha1 -crypto/subtle -crypto/dsa -crypto/sha256 -crypto/ecdsa -crypto/internal/boring/bcache -crypto/internal/boring/bbig -crypto/internal/boring/sig -crypto/internal/boring -crypto/internal/edwards25519 -crypto/internal/nistec -crypto/internal/nistec/fiat -crypto/internal/alias -crypto/internal/edwards25519/field -crypto/internal/bigmod -crypto/internal/randutil -crypto/cipher -crypto/hmac -crypto/ed25519 -crypto/md5 -crypto/elliptic -testing