Skip to content

Commit d9c999e

Browse files
authored
Merge pull request #6 from NixOS/master
Merge pull request NixOS#443 from heirecka/also-pass-strip-to-tests
2 parents 1a038d5 + fe78964 commit d9c999e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
- name: Build windows executable
3636
run: |
3737
nix build -L .#patchelf-win32 .#patchelf-win64
38-
install -D ./result/bin/patchelf.exe ./dist/patchelf-win32.exe
39-
install -D ./result-1/bin/patchelf.exe ./dist/patchelf-win64.exe
38+
install -D ./result/bin/patchelf.exe ./dist/patchelf-win32-$(cat version).exe
39+
install -D ./result-1/bin/patchelf.exe ./dist/patchelf-win64-$(cat version).exe
4040
- uses: actions/upload-artifact@v3
4141
with:
4242
name: patchelf
@@ -55,10 +55,10 @@ jobs:
5555
- name: Show binaries
5656
run: dir .\\dist
5757
- name: Test windows 64-bit binary
58-
run: .\\dist\\patchelf-win32.exe --version
58+
run: .\\dist\\patchelf-win32-*.exe --version
5959

6060
- name: Test windows 32-bit binary
61-
run: .\\dist\\patchelf-win64.exe --version
61+
run: .\\dist\\patchelf-win64-*.exe --version
6262

6363
build_musl:
6464
name: Build static musl binaries

tests/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TESTS = $(src_TESTS) $(build_TESTS)
5252

5353
EXTRA_DIST = no-rpath-prebuild $(src_TESTS) no-rpath-prebuild.sh invalid-elf endianness empty-note
5454

55-
TESTS_ENVIRONMENT = PATCHELF_DEBUG=1 OBJDUMP=$(OBJDUMP) READELF=$(READELF) OBJCOPY=$(OBJCOPY)
55+
TESTS_ENVIRONMENT = PATCHELF_DEBUG=1 STRIP=$(STRIP) OBJDUMP=$(OBJDUMP) READELF=$(READELF) OBJCOPY=$(OBJCOPY)
5656

5757
$(no_rpath_arch_TESTS): no-rpath-prebuild.sh
5858
@ln -s $< $@

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.17.0
1+
0.18.0-alpha

0 commit comments

Comments
 (0)