Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.5.0
8.5.1
10 changes: 5 additions & 5 deletions .github/workflows/install-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ TDIR="$(mktemp -d)"
>&2 echo "Working dir: ${TDIR}"
trap "rm -rf ${TDIR}" EXIT

>&2 echo "Downloading Go 1.23.7 distribution file."
curl -fL -o "${TDIR}/go1.23.7.linux-amd64.tar.gz" 'https://go.dev/dl/go1.23.7.linux-amd64.tar.gz'
>&2 echo "Downloading Go 1.24.8 distribution file."
curl -fL -o "${TDIR}/go1.24.8.linux-amd64.tar.gz" 'https://go.dev/dl/go1.24.8.linux-amd64.tar.gz'

>&2 echo "Checking distribution file integrity"
GO_DIST_SHA256='4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3'
printf '%s %s/go1.23.7.linux-amd64.tar.gz\n' "${GO_DIST_SHA256}" "${TDIR}" | sha256sum -c
GO_DIST_SHA256='6842c516ca66c89d648a7f1dbe28e28c47b61b59f8f06633eb2ceb1188e9251d'
printf '%s %s/go1.24.8.linux-amd64.tar.gz\n' "${GO_DIST_SHA256}" "${TDIR}" | sha256sum -c

>&2 echo "Unpacking to /usr/local/go"
rm -rf /usr/local/go && tar -C /usr/local -xzf "${TDIR}/go1.23.7.linux-amd64.tar.gz"
rm -rf /usr/local/go && tar -C /usr/local -xzf "${TDIR}/go1.24.8.linux-amd64.tar.gz"

>&2 echo "Installed Go version:"
/usr/local/go/bin/go version
2 changes: 1 addition & 1 deletion .github/workflows/publish-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
# separately in each cibuildwheel build container
if: "${{ runner.os != 'Linux' }}"
with:
go-version: "1.23.7"
go-version: "1.24.8"

- name: Build wheels
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.23"
go-version: "1.24"
- name: Extract version
id: extract_version
run: |
Expand Down
42 changes: 23 additions & 19 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
load(
"@bazel_gazelle//:def.bzl",
"gazelle",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
load("@gazelle//:def.bzl", "gazelle")
load("@rules_go//go:def.bzl", "go_library", "go_test")

# gazelle:prefix github.com/google/go-jsonnet
gazelle(
name = "gazelle",
)

go_library(
# keep: support old target name.
alias(
name = "go_default_library",
actual = ":go-jsonnet",
visibility = ["//visibility:public"],
)

go_library(
name = "go-jsonnet",
srcs = [
"builtins.go",
"debugger.go",
Expand All @@ -28,30 +32,30 @@ go_library(
importpath = "github.com/google/go-jsonnet",
visibility = ["//visibility:public"],
deps = [
"//ast:go_default_library",
"//astgen:go_default_library",
"//internal/errors:go_default_library",
"//internal/parser:go_default_library",
"//internal/program:go_default_library",
"//toolutils:go_default_library",
"@io_k8s_sigs_yaml//:go_default_library",
"@org_golang_x_crypto//sha3:go_default_library",
"//ast",
"//astgen",
"//internal/errors",
"//internal/parser",
"//internal/program",
"//toolutils",
"@io_k8s_sigs_yaml//:yaml",
"@org_golang_x_crypto//sha3",
],
)

go_test(
name = "go_default_test",
name = "go-jsonnet_test",
srcs = [
"builtins_benchmark_test.go",
"interpreter_test.go",
"jsonnet_test.go",
"main_test.go",
],
data = glob(["testdata/**"]),
embed = [":go_default_library"],
embed = [":go-jsonnet"],
deps = [
"//ast:go_default_library",
"//internal/parser:go_default_library",
"//internal/testutils:go_default_library",
"//ast",
"//internal/parser",
"//internal/testutils",
],
)
21 changes: 14 additions & 7 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
module(name = "jsonnet_go", version = "0.21.0")
module(
name = "jsonnet_go",
version = "0.21.0",
)

http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# NB: update_cpp_jsonnet.sh looks for these.
CPP_JSONNET_SHA256 = "bd0164015ad8f91fd1a879d46eef568aabea66f844ce5c264c375c89022aa1a1"

CPP_JSONNET_GITHASH = "3560b6d317b127dc901ad4674312bfd12d95a301"

CPP_JSONNET_RELEASE_VERSION = ""

CPP_JSONNET_STRIP_PREFIX = (
"jsonnet-" + (
CPP_JSONNET_RELEASE_VERSION if CPP_JSONNET_RELEASE_VERSION else CPP_JSONNET_GITHASH
)
)

CPP_JSONNET_URL = (
"https://github.com/google/jsonnet/releases/download/%s/jsonnet-%s.tar.gz" % (
CPP_JSONNET_RELEASE_VERSION,
Expand All @@ -29,16 +35,17 @@ http_archive(
urls = [CPP_JSONNET_URL],
)

bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "gazelle", version = "0.47.0")
bazel_dep(name = "rules_go", version = "0.59.0")

# rules_cc is needed, because we pull in cpp_jsonnet Bazel module to get the standard library.
bazel_dep(name = "rules_cc", version = "0.2.14")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.23.12")
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
go_sdk.from_file(go_mod = "//:go.mod")

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "@jsonnet_go//:go.mod")
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
use_repo(
go_deps,
"com_github_fatih_color",
Expand Down
Loading