Skip to content

Commit 80fbade

Browse files
giordanowsmoses
authored andcommitted
Decouple upstream registry and its fork during registration
1 parent af01815 commit 80fbade

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

.ci/Manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
3838

3939
[[deps.BinaryBuilder]]
4040
deps = ["ArgParse", "BinaryBuilderBase", "Binutils_jll", "Dates", "Downloads", "GitHub", "HTTP", "JLD2", "JSON", "LibGit2", "Libdl", "Logging", "LoggingExtras", "ObjectFile", "OutputCollectors", "Patchelf_jll", "Pkg", "PkgLicenses", "REPL", "Random", "Registrator", "RegistryTools", "SHA", "Scratch", "Sockets", "TOML", "UUIDs", "ghr_jll"]
41-
git-tree-sha1 = "346e66c10cc2c17289d5a2036e677502b061e5ee"
41+
git-tree-sha1 = "199e2279812c43eada98939d28c00df559d0f38f"
4242
repo-rev = "mg/debug"
4343
repo-url = "https://github.com/JuliaPackaging/BinaryBuilder.jl.git"
4444
uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"

.ci/Project.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ BinaryBuilder = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
33
BinaryBuilderBase = "7f725544-6523-48cd-82d1-3fa08ff4056e"
44
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
55
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
6+
GitHub = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
67
HistoricalStdlibVersions = "6df8b67a-e8a0-4029-b4b7-ac196fe72102"
78
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
89
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -12,10 +13,15 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
1213
ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"
1314
squashfs_tools_jll = "eed32e3e-a7c5-5bf9-9121-5cf3ab653887"
1415

15-
[sources]
16-
BinaryBuilder = {rev = "master", url = "https://github.com/JuliaPackaging/BinaryBuilder.jl.git"}
17-
BinaryBuilderBase = {rev = "master", url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"}
18-
1916
[compat]
17+
GitHub = "5"
2018
HistoricalStdlibVersions = "=2.0.2"
2119
ghr_jll = "0.14.0"
20+
21+
[sources.BinaryBuilder]
22+
rev = "master"
23+
url = "https://github.com/JuliaPackaging/BinaryBuilder.jl.git"
24+
25+
[sources.BinaryBuilderBase]
26+
rev = "master"
27+
url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"

.ci/register_package.jl

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using BinaryBuilder, BinaryBuilderBase, Downloads, Pkg
1+
using BinaryBuilder, BinaryBuilder.Wizard, BinaryBuilderBase, Downloads, Pkg
2+
import GitHub: gh_get_json, DEFAULT_API
23

34
# FIXME: Golang auto-upgrades to HTTP2, this can cause issue like https://github.com/google/go-github/issues/2113
45
ENV["GODEBUG"] = "http2client=0"
@@ -123,4 +124,15 @@ end
123124

124125
# Sub off to Registrator to create a PR to General. Note: it's important to pass both
125126
# `augment_platform_block` and `lazy_artifacts` to build the right Project dictionary
126-
BinaryBuilder.register_jll(name, build_version, dependencies, julia_compat; augment_platform_block, lazy_artifacts)
127+
gh_auth = Wizard.github_auth(;allow_anonymous=false)
128+
gh_username = "enzymead-bot[bot]"
129+
registry_url = "https://github.com/JuliaRegistries/General"
130+
registry_fork_url = "https://$(gh_username):$(gh_auth.token)@github.com/EnzymeAD/General"
131+
BinaryBuilder.register_jll(name, build_version, dependencies, julia_compat;
132+
augment_platform_block,
133+
lazy_artifacts,
134+
gh_auth,
135+
gh_username,
136+
registry_url,
137+
registry_fork_url,
138+
)

0 commit comments

Comments
 (0)