Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust release script to write the correct deps #74

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Adjust release script to write the correct deps #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a994f2
Adjust release script to write the correct deps
rmohr Jul 11, 2024
81c76b6
Update test targets
rmohr Jul 11, 2024
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
9 changes: 7 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,19 @@ gazelle:
bazelisk run //:gazelle

test: gazelle
bazelisk test //pkg/...
bazelisk build --config=built-toolchain //... && bazelisk test --config=built-toolchain //...

buildifier:
bazelisk run //:buildifier

gofmt:
gofmt -w pkg/.. cmd/..

e2e:
(cd e2e/bazel-5 && bazelisk build //...)
(cd e2e/bazel-6 && bazelisk build //...)
(cd e2e/bazel-7 && bazelisk build //...)

fmt: gofmt buildifier

.PHONY: gazelle test deps-update buildifier gofmt fmt
.PHONY: gazelle test deps-update buildifier gofmt fmt e2e
5 changes: 4 additions & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,7 @@ aspect_bazel_lib_register_toolchains()

load("@bazeldnf//bazeldnf:toolchain.bzl", "bazeldnf_prebuilt_register_toolchains")

bazeldnf_prebuilt_register_toolchains(name = "bazeldnf_prebuilt", register_toolchains = False)
bazeldnf_prebuilt_register_toolchains(
name = "bazeldnf_prebuilt",
register_toolchains = False,
)
43 changes: 36 additions & 7 deletions bazeldnf/deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,77 @@
"""bazeldnf public dependency for WORKSPACE"""

load(
"@bazel_tools//tools/build_defs/repo:http.bzl",
"http_archive",
"http_file",
)
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
load(
"@bazeldnf//internal:rpm.bzl",
_rpm = "rpm",
)

rpm = _rpm

def bazeldnf_dependencies():
"""bazeldnf dependencies when consuming the repo externally"""
maybe(
http_archive,
name = "bazel_skylib",
sha256 = "f24ab666394232f834f74d19e2ff142b0af17466ea0c69a3f4c276ee75f6efce",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.0/bazel-skylib-1.4.0.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.0/bazel-skylib-1.4.0.tar.gz",
],
)
maybe(
http_archive,
name = "platforms",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
"https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
],
sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
)
http_file(
name = "bazeldnf-linux-amd64",
executable = True,
sha256 = "7e1035d8bd2f25b787b04843f4d6a05e7cdbd3995926497c2a587e52da6262a8",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-linux-amd64"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-linux-amd64"],
)
http_file(
name = "bazeldnf-linux-arm64",
executable = True,
sha256 = "d954b785bfd79dbbd66a2f3df02b0d3a51f1fed4508a6d88fda13a9d24c878cc",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-linux-arm64"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-linux-arm64"],
)
http_file(
name = "bazeldnf-darwin-amd64",
executable = True,
sha256 = "92afc7f6475981adf9ae32b563b051869d433d8d8c9666e28a1c1c6e840394cd",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-darwin-amd64"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-darwin-amd64"],
)
http_file(
name = "bazeldnf-darwin-arm64",
executable = True,
sha256 = "c5e99ed72448026ee63259a0a28440f8b43a125414fa312edbd569c2976515a3",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-darwin-arm64"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-darwin-arm64"],
)
http_file(
name = "bazeldnf-linux-ppc64",
executable = True,
sha256 = "9d5337c1afe4bab858742718ac4c230d9ca368299cb97c50078eef14ae180922",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-linux-ppc64"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-linux-ppc64"],
)
http_file(
name = "bazeldnf-linux-ppc64le",
executable = True,
sha256 = "7ea4db00947914bc1c51e8f042fe220a3167c65815c487eccd0c541ecfa78aa1",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-linux-ppc64le"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-linux-ppc64le"],
)
http_file(
name = "bazeldnf-linux-s390x",
executable = True,
sha256 = "09aa4abcb1d85da11642889826b982ef90547eb32099fc8177456c92f66a4cfd",
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.6.0-rc1/bazeldnf-v0.6.0-rc1-linux-s390x"],
urls = ["https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9-linux-s390x"],
)
4 changes: 2 additions & 2 deletions cmd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ go_binary(

bazeldnf_toolchain(
name = "host-toolchain",
tool = ":cmd"
tool = ":cmd",
)

toolchain(
name = "bazeldnf-host-toolchain",
toolchain_type = "//bazeldnf:toolchain",
toolchain = ":host-toolchain",
toolchain_type = "//bazeldnf:toolchain",
)
29 changes: 29 additions & 0 deletions hack/prepare-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,41 @@ build_arch linux ppc64le
build_arch linux s390x

cat <<EOT >bazeldnf/deps.bzl
"""bazeldnf public dependency for WORKSPACE"""

load(
"@bazel_tools//tools/build_defs/repo:http.bzl",
"http_archive",
"http_file",
)
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
load(
"@bazeldnf//internal:rpm.bzl",
_rpm = "rpm",
)

rpm = _rpm

def bazeldnf_dependencies():
"""bazeldnf dependencies when consuming the repo externally"""
maybe(
http_archive,
name = "bazel_skylib",
sha256 = "f24ab666394232f834f74d19e2ff142b0af17466ea0c69a3f4c276ee75f6efce",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.0/bazel-skylib-1.4.0.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.0/bazel-skylib-1.4.0.tar.gz",
],
)
maybe(
http_archive,
name = "platforms",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
"https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
],
sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
)
EOT

write_arch linux amd64
Expand Down
Loading