Skip to content

Commit 0630e21

Browse files
authored
Improve use of p7zip command in tests (#102)
* Improve use of p7zip command in tests * Update Downstream CI
1 parent 9fb67c9 commit 0630e21

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/Downstream.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ jobs:
1616
- "PPTX"
1717
- "XLSX"
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- uses: julia-actions/setup-julia@v2
2121
with:
2222
version: 1
2323
arch: x64
24-
- uses: julia-actions/julia-buildpkg@latest
24+
show-versioninfo: true
2525
- name: Load this and run the downstream tests
2626
shell: julia --color=yes {0}
2727
run: |
2828
using Pkg
29+
ENV["JULIA_PKG_PRECOMPILE_AUTO"]=0
2930
Pkg.Registry.update()
3031
Pkg.activate(;temp=true)
3132
# force it to use this PR's version of the package

test/external_unzippers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function unzip_p7zip(zippath, dirpath)
2121
# "LANG"=>"C.UTF-8" env variable is sometimes needed to get p7zip to use utf8
2222
# pipe output to devnull because p7zip is noisy
2323
# run(addenv(`$(p7zip_jll.p7zip()) x -y -o$(dirpath) $(zippath)`, "LANG"=>"C.UTF-8"))
24-
run(pipeline(addenv(`$(p7zip_jll.p7zip()) x -y -o$(dirpath) $(zippath)`, "LANG"=>"C.UTF-8"), devnull))
24+
run(pipeline(addenv(`$(p7zip_jll.p7zip()) x -tzip -y -o$(dirpath) -- $(zippath)`, "LANG"=>"C.UTF-8"), devnull))
2525
nothing
2626
end
2727

test/test_reader.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ end
245245
mktempdir() do tmpout
246246
data = read(file)
247247
r = ZipReader(data)
248-
p7zip_jll.p7zip() do exe
249-
run(pipeline(`$(exe) x -y -o$(tmpout) $(file)`, devnull))
250-
end
248+
run(pipeline(`$(p7zip_jll.p7zip()) x -tzip -y -o$(tmpout) -- $(file)`, devnull))
251249
for i in 1:zip_nentries(r)
252250
zip_test_entry(r, i)
253251
name = zip_name(r, i)

0 commit comments

Comments
 (0)