@@ -15,13 +15,6 @@ bazel_dep(name = "rules_shell", version = "0.4.1")
1515bazel_lib_toolchains = use_extension ("@aspect_bazel_lib//lib:extensions.bzl" , "toolchains" )
1616use_repo (bazel_lib_toolchains , "zstd_toolchains" )
1717use_repo (bazel_lib_toolchains , "bsd_tar_toolchains" )
18- use_repo (bazel_lib_toolchains , "yq_darwin_amd64" )
19- use_repo (bazel_lib_toolchains , "yq_darwin_arm64" )
20- use_repo (bazel_lib_toolchains , "yq_linux_amd64" )
21- use_repo (bazel_lib_toolchains , "yq_linux_arm64" )
22- use_repo (bazel_lib_toolchains , "yq_linux_ppc64le" )
23- use_repo (bazel_lib_toolchains , "yq_linux_s390x" )
24- use_repo (bazel_lib_toolchains , "yq_windows_amd64" )
2518
2619# Dev dependencies
2720bazel_dep (name = "gazelle" , version = "0.34.0" , dev_dependency = True , repo_name = "bazel_gazelle" )
@@ -58,39 +51,90 @@ apt = use_extension(
5851 "apt" ,
5952 dev_dependency = True ,
6053)
61- apt .install (
62- name = "bullseye" ,
63- lock = "//examples/debian_snapshot:bullseye.lock.json" ,
64- manifest = "//examples/debian_snapshot:bullseye.yaml" ,
65- )
66- apt .install (
67- name = "bullseye_nolock" ,
68- manifest = "//examples/debian_snapshot:bullseye.yaml" ,
69- nolock = True ,
54+ apt .sources_list (
55+ architectures = ["amd64" ],
56+ components = ["main" ],
57+ suites = [
58+ "noble" ,
59+ "noble-security" ,
60+ "noble-updates" ,
61+ ],
62+ types = ["deb" ],
63+ uris = [
64+ "https://snapshot.ubuntu.com/ubuntu/20240301T030400Z" ,
65+ "mirror+https://snapshot.ubuntu.com/ubuntu/20240301T030400Z" ,
66+ ],
67+ # TODO: signed_by
7068)
71- apt .install (
72- name = "noble" ,
73- lock = "//examples/ubuntu_snapshot:noble.lock.json" ,
74- manifest = "//examples/ubuntu_snapshot:noble.yaml" ,
69+ apt .sources_list (
70+ architectures = ["amd64" ],
71+ components = ["main" ],
72+ suites = ["cloud-sdk" ],
73+ types = ["deb" ],
74+ uris = ["https://packages.cloud.google.com/apt" ],
7575)
76- apt .install (
77- name = "resolution_test" ,
78- manifest = "apt/tests/resolution/security.yaml" ,
79- nolock = True ,
76+ apt .sources_list (
77+ architectures = ["amd64" ],
78+ components = ["main" ],
79+ suites = ["cloud-sdk" ],
80+ types = ["deb" ],
81+ uris = ["https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/" ],
8082)
81- apt .install (
82- name = "resolution_test_empty_lock" ,
83- lock = "//apt/tests/resolution:empty.lock.json" ,
84- manifest = "apt/tests/resolution/security.yaml" ,
83+ apt .sources_list (
84+ architectures = [
85+ "amd64" ,
86+ "arm64" ,
87+ "i386" ,
88+ ],
89+ components = ["main" ],
90+ suites = [
91+ "bookworm" ,
92+ "bookworm-updates" ,
93+ ],
94+ types = ["deb" ],
95+ uris = ["https://snapshot.debian.org/archive/debian/20240210T223313Z" ],
8596)
86- apt .install (
87- name = "arch_all_test" ,
88- manifest = "apt/tests/resolution/arch_all.yaml" ,
89- nolock = True ,
97+ apt .sources_list (
98+ architectures = [
99+ "amd64" ,
100+ "arm64" ,
101+ "i386" ,
102+ ],
103+ components = ["main" ],
104+ suites = ["bookworm-security" ],
105+ types = ["deb" ],
106+ uris = ["https://snapshot.debian.org/archive/debian-security/20240210T223313Z" ],
90107)
91108apt .install (
92- name = "clang" ,
93- manifest = "apt/tests/resolution/clang.yaml" ,
94- nolock = True ,
109+ # dependency_set isolates these installs into their own scope.
110+ # installing onto default dependency_set only allowed in the
111+ # root module
112+ dependency_set = "bookworm" ,
113+ packages = [
114+ "base-files" ,
115+ "coreutils:arm64" ,
116+ "google-cloud-cli:amd64" ,
117+ "libncurses6" ,
118+ "libstdc++6:i386" ,
119+ "ncurses-base" ,
120+ "tzdata" ,
121+ ],
122+ suites = [
123+ "bookworm" ,
124+ "bookworm-updates" ,
125+ "bookworm-security" ,
126+ "cloud-sdk" ,
127+ ],
95128)
96- use_repo (apt , "arch_all_test" , "arch_all_test_resolve" , "bullseye" , "bullseye_nolock" , "clang" , "noble" , "resolution_test" , "resolution_test_empty_lock_resolve" , "resolution_test_resolve" )
129+ use_repo (apt , "bookworm" )
130+
131+ # TODO: support this style of source_list
132+ #
133+ # apt.sources_list(
134+ # sources = [
135+ # "deb [arch=amd64,arm64] https://snapshot.ubuntu.com/ubuntu/20240301T030400Z noble main",
136+ # "deb [arch=amd64,arm64] https://snapshot.ubuntu.com/ubuntu/20240301T030400Z noble-security main",
137+ # "deb [arch=amd64,arm64] https://snapshot.ubuntu.com/ubuntu/20240301T030400Z noble-updates main",
138+ # ],
139+ # )
140+ #
0 commit comments