Skip to content

Commit

Permalink
Remove release toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
peterebden committed Oct 29, 2024
1 parent 8cc422a commit 5c45ce8
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/puku.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Build puku
run: ./pleasew build -p -v notice --profile release //package:release_files
run: ./pleasew build -p -v notice //package:release_files
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions .plzconfig.release

This file was deleted.

6 changes: 2 additions & 4 deletions knownimports/BUILD
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
root = f"third_party/go/toolchain/pkg/{CONFIG.OS}_{CONFIG.ARCH}"

genrule(
name = "go_root_packages",
srcs = ["//third_party/go:toolchain"],
srcs = ["//third_party/go:std"],
outs = ["go_root_packages"],
cmd = f'find {root} -name "*.a" | sed -e s=^{root}/== | sed -e s="\.a\$"== > $OUT',
cmd = 'find $SRCS -name "*.a" | sed -re s=^third_party/go/std/pkg/[^/]+_[^/]+/== | sed -e s="\.a\$"== > $OUT',
)

go_library(
Expand Down
3 changes: 1 addition & 2 deletions knownimports/known_imports.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ func IsInGoRoot(i string) bool {
if strings.HasPrefix(i, "crypto/") {
return true
}
_, ok := goRootImports[i]
if ok {
if _, ok := goRootImports[i]; ok {
return true
}

Expand Down
6 changes: 0 additions & 6 deletions package/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ filegroup(

subinclude(":architectures")

go_toolchain(
name = "release_toolchain",
architectures = architectures,
version = CONFIG.GO_VERSION,
)

def cross_compile(version, arch):
return build_rule(
name = f"puku_{arch}",
Expand Down
2 changes: 1 addition & 1 deletion third_party/go/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ subinclude("///go//build_defs:go", "//package:architectures")

go_toolchain(
name = "toolchain",
architectures = architectures,
version = CONFIG.GO_VERSION,
install_std = False,
)

go_stdlib(
Expand Down

0 comments on commit 5c45ce8

Please sign in to comment.