Skip to content

Commit b15f326

Browse files
committed
TO-DROP: try to figure out _which_ .dll files are rebased
In the tmate session, it does not look as if the i686 variants of the `.dll` files we want to target are actually modified, even if the `rebase -i` call claims that this was done correctly. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 29d27ff commit b15f326

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,20 @@ jobs:
166166
$env:PATH = "$(Get-Location)\usr\bin;" + $env:PATH
167167
$env:MSYS2_PATH_TYPE = "minimal"
168168
169-
sh.exe -lc "set -x && find /usr/lib/perl5/*_perl -name \*.dll >perl-dlls.txt"
169+
sh.exe -lc "set -x && cygpath -aw /usr/lib/perl5 && find /usr/lib/perl5/*_perl -name \*.dll >perl-dlls.txt"
170170
type perl-dlls.txt
171171
dash -x /usr/bin/rebaseall -p -T perl-dlls.txt
172172
173173
# Work around for:
174174
# - address space needed by 'Cwd.dll' is already occupied
175175
# - address space needed by 'Dumper.dll' is already occupied
176176
# etc
177-
bash -lc "set -x && rebase -b 0x61500000 /usr/lib/perl5/core_perl/auto/*/{*,*/*}.dll"
177+
bash -lc "set -x && cygpath -aw /usr/lib/perl5/core_perl/auto && rebase -b 0x61500000 /usr/lib/perl5/core_perl/auto/*/{*,*/*}.dll"
178178
# Work around for:
179179
# - address space needed by 'Cwd.dll' is already occupied
180-
bash -lc "set -x && rebase -v -b 0x63f00000 /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
180+
bash -lc "set -x && type -p rebase && cygpath -aw /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll && rebase -v -b 0x63f00000 /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
181181
# verify the base address
182-
bash -lc "set -x && rebase -v -i /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
182+
bash -lc "set -x && type -p rebase && cygpath -aw /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll && rebase -v -i /usr/lib/perl5/core_perl/auto/Cwd/Cwd.dll"
183183
184184
- name: Get GPG key(s)
185185
shell: bash

0 commit comments

Comments
 (0)