Skip to content

Commit 01d07cf

Browse files
committed
bazel: fix e2e test
* update lock file * add missing dependencies
1 parent 97297b7 commit 01d07cf

File tree

2 files changed

+44
-16
lines changed

2 files changed

+44
-16
lines changed

e2e/bazel-bzlmod-lock-file-from-args/MODULE.bazel

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ local_path_override(
99
)
1010

1111
bazel_dep(name = "rules_pkg", version = "1.0.1")
12-
bazel_dep(name = "rules_go", version = "0.49.0", repo_name = "rules_go")
13-
bazel_dep(name = "gazelle", version = "0.37.0")
12+
bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "rules_go")
13+
14+
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
15+
go_sdk.download(version = "1.24.1")
16+
17+
bazel_dep(name = "gazelle", version = "0.42.0")
1418

1519
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
1620
go_deps.from_file(go_mod = "@bazeldnf//:go.mod")
@@ -19,16 +23,19 @@ use_repo(
1923
"com_github_adrg_xdg",
2024
"com_github_bazelbuild_buildtools",
2125
"com_github_crillab_gophersat",
26+
"com_github_jdx_go_netrc",
27+
"com_github_klauspost_compress",
2228
"com_github_onsi_gomega",
2329
"com_github_sassoftware_go_rpmutils",
2430
"com_github_sirupsen_logrus",
2531
"com_github_spf13_cobra",
2632
"io_k8s_sigs_yaml",
2733
"org_golang_x_crypto",
34+
"org_golang_x_exp",
2835
)
2936

30-
bazeldnf_toolchain = use_extension("@bazeldnf//bazeldnf:extensions.bzl", "toolchain")
31-
bazeldnf_toolchain.toolchain(disable = True)
37+
bazeldnf_toolchain = use_extension("@bazeldnf//bazeldnf:extensions.bzl", "bazeldnf_toolchain")
38+
bazeldnf_toolchain.register(disable = True)
3239

3340
bazeldnf = use_extension("@bazeldnf//bazeldnf:extensions.bzl", "bazeldnf")
3441
bazeldnf.config(

e2e/bazel-bzlmod-lock-file-from-args/bazeldnf-lock.json

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,63 @@
2020
"alternatives",
2121
"--force-ignore-with-dependencies",
2222
"audit-libs",
23+
"--force-ignore-with-dependencies",
24+
"fedora-release-common",
2325
"bash",
2426
"--ignore-missing"
2527
],
2628
"name": "",
2729
"repositories": {
28-
"Abuild-eos-trunk": [
29-
"http://buildpack/Abuild/eos-trunk/x86_64_el9/40494756/RPMS/"
30+
"40-x86_64-primary-repo": [
31+
"https://mirror.i3d.net/pub/fedora/linux/releases/40/Everything/x86_64/os/",
32+
"https://ask4.mm.fcix.net/fedora/linux/releases/40/Everything/x86_64/os/",
33+
"https://fedora.ip-connect.info/linux/releases/40/Everything/x86_64/os/",
34+
"https://distrohub.kyiv.ua/fedora/fedora/linux/releases/40/Everything/x86_64/os/"
35+
],
36+
"40-x86_64-update-repo": [
37+
"https://ftp.halifax.rwth-aachen.de/fedora/linux/updates/40/Everything/x86_64/",
38+
"https://fr2.rpmfind.net/linux/fedora/linux/updates/40/Everything/x86_64/",
39+
"https://ftp-stud.hs-esslingen.de/pub/fedora/linux/updates/40/Everything/x86_64/",
40+
"https://mirror.datacenter.by/pub/fedoraproject.org/linux/updates/40/Everything/x86_64/"
3041
]
3142
},
3243
"rpms": [
3344
{
3445
"name": "bash",
35-
"integrity": "sha256-BdwbgGvVRW1A49f4gurQN6r0gMWW6D+/tquGvnSi2NE=",
46+
"integrity": "sha256-FW4HMwjLKKWmmdb/r8ccvShIdij9BUceGXjkuaXHqAI=",
3647
"urls": [
37-
"bash-5.1.8-9.el9.x86_64.rpm"
48+
"Packages/b/bash-5.2.26-3.fc40.x86_64.rpm"
3849
],
39-
"repository": "Abuild-eos-trunk",
50+
"repository": "40-x86_64-primary-repo",
4051
"dependencies": [
4152
"ncurses-libs"
4253
]
4354
},
55+
{
56+
"name": "fedora-release-container",
57+
"integrity": "sha256-TQccXscGmgySaJ6kKutIHmgswOLfYSYNcDwqNRu8Q88=",
58+
"urls": [
59+
"Packages/f/fedora-release-container-40-40.noarch.rpm"
60+
],
61+
"repository": "40-x86_64-update-repo",
62+
"dependencies": []
63+
},
4464
{
4565
"name": "ncurses-base",
46-
"integrity": "sha256-2DB7+9JCjI0I3v+v8exh97wBbvA8d3mLMs4CGWXhvGU=",
66+
"integrity": "sha256-ipM3bOdCO9GmSaE/S1EF8nC0YD9c87PiML29p/Jd14g=",
4767
"urls": [
48-
"ncurses-base-6.2-10.20210508.el9.noarch.rpm"
68+
"Packages/n/ncurses-base-6.4-12.20240127.fc40.noarch.rpm"
4969
],
50-
"repository": "Abuild-eos-trunk",
70+
"repository": "40-x86_64-primary-repo",
5171
"dependencies": []
5272
},
5373
{
5474
"name": "ncurses-libs",
55-
"integrity": "sha256-0GsOSRSBo0X68hppZmy9wwLRm1T7Ka4ap4+msgX55gQ=",
75+
"integrity": "sha256-oY7fMuia79RTmY1dDsOqHqGT2sQ/gLmdsZWr1+jPGgQ=",
5676
"urls": [
57-
"ncurses-libs-6.2-10.20210508.el9.x86_64.rpm"
77+
"Packages/n/ncurses-libs-6.4-12.20240127.fc40.x86_64.rpm"
5878
],
59-
"repository": "Abuild-eos-trunk",
79+
"repository": "40-x86_64-primary-repo",
6080
"dependencies": [
6181
"ncurses-base"
6282
]
@@ -66,7 +86,8 @@
6686
"bash"
6787
],
6888
"ignored": [
89+
"fedora-release-common",
6990
"filesystem",
7091
"glibc"
7192
]
72-
}
93+
}

0 commit comments

Comments
 (0)