Skip to content

Commit a041aad

Browse files
staticfloatstaticfloat
committed
Switch to using HelloWorldC_jll's Artifacts.toml
We were previously using a janky artifacts file that I had made in a one-off manner, better to just use the latest `HelloWorldC_jll`'s Artifacts.toml file, and download the latest version of that anytime we need a new `Artifacts.toml` file to test against.
1 parent 04b45e4 commit a041aad

File tree

4 files changed

+133
-36
lines changed

4 files changed

+133
-36
lines changed

Diff for: ‎docs/src/apps.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,14 @@ julia> names(MyApp; all=true)
251251
Symbol("#1#3")
252252
Symbol("#2#4")
253253
Symbol("#eval")
254-
Symbol("#fooifier_path")
254+
Symbol("#hello_world_path")
255255
Symbol("#include")
256256
Symbol("#is_crayons_loaded")
257257
Symbol("#julia_main")
258258
Symbol("#real_main")
259259
:MyApp
260260
:eval
261-
:fooifier_path
261+
:hello_world_path
262262
:include
263263
:is_crayons_loaded
264264
:julia_main

Diff for: ‎examples/MyApp/Artifacts.toml

+126-29
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,143 @@
1-
[[fooifier]]
2-
arch = "x86_64"
3-
git-tree-sha1 = "98d93024ca384050c59d554415b75d61e467fd8c"
1+
[[HelloWorldC]]
2+
arch = "aarch64"
3+
git-tree-sha1 = "d4036700fbbf29b31f5d1d5d948547edd3b70e11"
4+
os = "macos"
5+
6+
[[HelloWorldC.download]]
7+
sha256 = "1fd55f038a73c89f4e22b437a9182421e0d31c50bd4912c719215f6a736d50f1"
8+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.aarch64-apple-darwin.tar.gz"
9+
[[HelloWorldC]]
10+
arch = "aarch64"
11+
git-tree-sha1 = "c82465bd6d0aa1369ff2fd961b73884d1f5de49a"
12+
libc = "glibc"
13+
os = "linux"
14+
15+
[[HelloWorldC.download]]
16+
sha256 = "5bfa84332c7ee485ca8e2eee216ad9fa77b2c43d5f261baa823e301b7c789ec4"
17+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.aarch64-linux-gnu.tar.gz"
18+
[[HelloWorldC]]
19+
arch = "aarch64"
20+
git-tree-sha1 = "cb4b8c88778c6cd93b6df38ec5b95a2678434f5d"
21+
libc = "musl"
22+
os = "linux"
23+
24+
[[HelloWorldC.download]]
25+
sha256 = "924df1c2a386f79a2727a2f989393102649a24863214f2e88cb4a677d3d22e14"
26+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.aarch64-linux-musl.tar.gz"
27+
[[HelloWorldC]]
28+
arch = "armv6l"
29+
call_abi = "eabihf"
30+
git-tree-sha1 = "20a32b71145b67e708f63fb5880a7243727aec0f"
431
libc = "glibc"
532
os = "linux"
633

7-
[[fooifier.download]]
8-
sha256 = "5208c63a9d07e592c78f541fc13caa8cd191b11e7e77b31d407237c2b13ec391"
9-
url = "https://github.com/staticfloat/small_bin/raw/master/libfoo/libfoo.x86_64-linux-gnu.tar.gz"
34+
[[HelloWorldC.download]]
35+
sha256 = "6f0997b0aad387ba6e2402530642bb4ded85b0243460d2e4b13d94f2c8340a44"
36+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.armv6l-linux-gnueabihf.tar.gz"
37+
[[HelloWorldC]]
38+
arch = "armv6l"
39+
call_abi = "eabihf"
40+
git-tree-sha1 = "c1179604ea37fa66ee6d5d592c7bbfd1f20292c3"
41+
libc = "musl"
42+
os = "linux"
1043

11-
[[fooifier]]
44+
[[HelloWorldC.download]]
45+
sha256 = "0aca47bce6f09c38a7939277a593deb988123fe59f7992225a1ede8e174f1b06"
46+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.armv6l-linux-musleabihf.tar.gz"
47+
[[HelloWorldC]]
48+
arch = "armv7l"
49+
call_abi = "eabihf"
50+
git-tree-sha1 = "0a8e7b523ef6be31311aefe9983a488616e58201"
51+
libc = "glibc"
52+
os = "linux"
53+
54+
[[HelloWorldC.download]]
55+
sha256 = "f29f4da556d2b4ee9eaff7740aa0f9436406b75b0f1ec428e881a47ab7b7477b"
56+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.armv7l-linux-gnueabihf.tar.gz"
57+
[[HelloWorldC]]
58+
arch = "armv7l"
59+
call_abi = "eabihf"
60+
git-tree-sha1 = "ca94b4d87f1a276066a2994733142e35046c41dd"
61+
libc = "musl"
62+
os = "linux"
63+
64+
[[HelloWorldC.download]]
65+
sha256 = "5fb4019d6d797e5e3860cfec90cab12f6865fa624e87b51c20220a44bb94846a"
66+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.armv7l-linux-musleabihf.tar.gz"
67+
[[HelloWorldC]]
1268
arch = "i686"
13-
git-tree-sha1 = "c3a9f27382862092e064bcf4aeb3cb7190578338"
69+
git-tree-sha1 = "cb1aefe048a6c0395b6b664695c20cb50dbec8e3"
1470
libc = "glibc"
1571
os = "linux"
1672

17-
[[fooifier.download]]
18-
sha256 = "97655b6a218d61284723b6923d7c96e6a256fa68b9419d723c588aa24404b102"
19-
url = "https://github.com/staticfloat/small_bin/raw/master/libfoo/libfoo.i686-linux-gnu.tar.gz"
73+
[[HelloWorldC.download]]
74+
sha256 = "c79def491d702590b9c82599d40c4e755251dbb49669d0290f9a1a7bf1d91a1a"
75+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.i686-linux-gnu.tar.gz"
76+
[[HelloWorldC]]
77+
arch = "i686"
78+
git-tree-sha1 = "b50220be02e9c839749f91a70694ae68c2712c8e"
79+
libc = "musl"
80+
os = "linux"
2081

21-
[[fooifier]]
82+
[[HelloWorldC.download]]
83+
sha256 = "6aecc06cf803ad16703744610deb243a21b39e19ae1951a38977610881698f9e"
84+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.i686-linux-musl.tar.gz"
85+
[[HelloWorldC]]
86+
arch = "i686"
87+
git-tree-sha1 = "0f7597f042d16d438f9684e20ca57ea22e4e15c1"
88+
os = "windows"
89+
90+
[[HelloWorldC.download]]
91+
sha256 = "5f14f5ade1314e777432bd85cd075ae9d31e28352e646f90adf0444a7a54f76b"
92+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.i686-w64-mingw32.tar.gz"
93+
[[HelloWorldC]]
94+
arch = "powerpc64le"
95+
git-tree-sha1 = "5e9c87fc4e3372c27a77061a49d97fa5002df0e4"
96+
libc = "glibc"
97+
os = "linux"
98+
99+
[[HelloWorldC.download]]
100+
sha256 = "e2a728b29124fc7408d6e47cc6fc943d0336d1386e56a3775a0665b34528881b"
101+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.powerpc64le-linux-gnu.tar.gz"
102+
[[HelloWorldC]]
22103
arch = "x86_64"
23-
git-tree-sha1 = "f413ff2438a4e9e9dd69b23c35ca30de6af069cc"
104+
git-tree-sha1 = "09ed293f6f5ebfcaf90eef2b4d45c402d834d33e"
24105
os = "macos"
25106

26-
[[fooifier.download]]
27-
sha256 = "fcc268772d6f21d65b45fcf3854a3142679b78e53c7673dac26c95d6ccc89a24"
28-
url = "https://github.com/staticfloat/small_bin/raw/master/libfoo/libfoo.x86_64-apple-darwin14.tar.gz"
107+
[[HelloWorldC.download]]
108+
sha256 = "9feabdcb8341d37d0c8b1acb5840e1c9d524632c5aff40c05b5e0e1d621a7e30"
109+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.x86_64-apple-darwin.tar.gz"
110+
[[HelloWorldC]]
111+
arch = "x86_64"
112+
git-tree-sha1 = "8c8251b0c21615bce0701995eded26ac7697b5cc"
113+
libc = "glibc"
114+
os = "linux"
29115

30-
[[fooifier]]
116+
[[HelloWorldC.download]]
117+
sha256 = "974f7e1d1cdbebad149e51fed4f1b7c6a0b5ccfa350f7d252dfcf66c2dbf9f63"
118+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.x86_64-linux-gnu.tar.gz"
119+
[[HelloWorldC]]
31120
arch = "x86_64"
32-
git-tree-sha1 = "d61f806c76b57e54f343634c5219d00d4c81b077" # FIX!
33-
os = "windows"
121+
git-tree-sha1 = "cfaaf0517421585561e3b30dd6f53f6c14b2835f"
122+
libc = "musl"
123+
os = "linux"
34124

35-
[[fooifier.download]]
36-
sha256 = "7f8939e9529835b83810d3ae7e2556f6e002d571f619894e54ece42ea5262b7f"
37-
url = "https://github.com/staticfloat/small_bin/raw/master/libfoo/libfoo.x86_64-w64-mingw32.tar.gz"
125+
[[HelloWorldC.download]]
126+
sha256 = "25d3d6ecc753f4dbbcaab0db7b6c20b29b0a79b0c31f7a26a0cf18c365d27809"
127+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.x86_64-linux-musl.tar.gz"
128+
[[HelloWorldC]]
129+
arch = "x86_64"
130+
git-tree-sha1 = "9adaeee1375ffd66613afe71f111dad3a88fb302"
131+
os = "freebsd"
38132

39-
[[fooifier]]
40-
arch = "aarch64"
41-
git-tree-sha1 = "281cbe3dd65aa4bdb887bfb29651da500c81e242"
42-
os = "linux"
133+
[[HelloWorldC.download]]
134+
sha256 = "8e59a00a9238d1605af09ec3a76c8bb5ad012b5621f5ccb7de6cf73f89fbf18f"
135+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.x86_64-unknown-freebsd.tar.gz"
136+
[[HelloWorldC]]
137+
arch = "x86_64"
138+
git-tree-sha1 = "59955b315ce95abd82f71d29389be3b734b14821"
139+
os = "windows"
43140

44-
[[fooifier.download]]
45-
sha256 = "36886ac25cf5678c01fe20630b413f9354b7a3721c6a2c2043162f7ebd147ff5"
46-
url = "https://github.com/staticfloat/small_bin/raw/master/libfoo/libfoo.aarch64-linux-gnu.tar.gz"
141+
[[HelloWorldC.download]]
142+
sha256 = "47bbead5cbdfca1b23544b1b398e8a2194c78ab8a772ca3075084c4a9ab75fb7"
143+
url = "https://github.com/JuliaBinaryWrappers/HelloWorldC_jll.jl/releases/download/HelloWorldC-v1.3.0+0/HelloWorldC.v1.3.0.x86_64-w64-mingw32.tar.gz"

Diff for: ‎examples/MyApp/src/MyApp.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const outputo = begin
1818
o == C_NULL ? "ok" : unsafe_string(o)
1919
end
2020

21-
fooifier_path() = joinpath(artifact"fooifier", "bin", "fooifier" * (Sys.iswindows() ? ".exe" : ""))
21+
hello_world_path() = joinpath(artifact"HelloWorldC", "bin", "hello_world" * (Sys.iswindows() ? ".exe" : ""))
2222

2323
function julia_main()::Cint
2424
try
@@ -61,8 +61,8 @@ function real_main()
6161
@show is_crayons_loaded()
6262

6363
println("Running the artifact")
64-
res = read(`$(fooifier_path()) 5 10`, String)
65-
println("The result of 2*5^2 - 10 == $res")
64+
res = read(`$(hello_world_path())`, String)
65+
println("From C: $res")
6666

6767
@show unsafe_string(Base.JLOptions().image_file)
6868
@show Example.domath(5)

Diff for: ‎test/runtests.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ end
115115
# Check PROGRAM_FILE
116116
@test occursin("Base.PROGRAM_FILE = $(repr(app_path("MyApp")))", app_output)
117117
# Check jll package runs
118-
@test occursin("Hello, World!", app_output)
118+
@test occursin("\nHello, World!", app_output)
119119
# Check artifact runs
120-
@test occursin("The result of 2*5^2 - 10 == 40.000000", app_output)
120+
@test occursin("From C: Hello, World!\n", app_output)
121121
# Check artifact gets run from the correct place
122122
@test occursin("HelloWorld artifact at $(realpath(app_compiled_dir))", app_output)
123123
# Check ARGS

0 commit comments

Comments
 (0)