Skip to content

Commit 453bb3d

Browse files
committed
Remove embedded prebuilt libs, fetch them from libdwarf-ghidra2dwarf and build the jar in the CI.
1 parent e2f6539 commit 453bb3d

File tree

9 files changed

+41
-13674
lines changed

9 files changed

+41
-13674
lines changed

.github/workflows/release.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,20 @@ jobs:
1313
- name: Run latest-tag
1414
uses: EndBug/latest-tag@latest
1515

16-
- run: |
17-
mv lib/target/libdwarf.jar src
16+
- name: Set up JDK 11
17+
uses: actions/setup-java@v1
18+
with:
19+
java-version: 11.0.4
20+
architecture: x64
21+
22+
- name: Build jar
23+
run: |
24+
cd lib
25+
./fetch_libs_and_build.sh
26+
mv target/libdwarf.jar ../src
27+
28+
- name: Zip release
29+
run: |
1830
mv src ghidra2dwarf
1931
zip ghidra2dwarf.zip ghidra2dwarf/libdwarf.jar ghidra2dwarf/ghidra2dwarf.py ghidra2dwarf/elf.py
2032

.github/workflows/tests.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
test-ubuntu:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v2
1616
- name: Set up JDK 11
1717
uses: actions/setup-java@v1
1818
with:
@@ -30,17 +30,18 @@ jobs:
3030
3131
- name: install gdb
3232
run: sudo apt install gdb
33-
34-
- name: copy lib
33+
34+
- name: Build jar
3535
run: |
36-
mkdir -p ~/.ghidra/.ghidra_9.1.2_PUBLIC/plugins/
37-
cp lib/target/libdwarf.jar ~/.ghidra/.ghidra_9.1.2_PUBLIC/plugins/
36+
cd lib
37+
./fetch_libs_and_build.sh
38+
mv target/libdwarf.jar ../src
3839
3940
- name: install python requirements
4041
run: |
4142
cd test
4243
sudo python3 -m pip install -r requirements.txt
43-
44+
4445
- name: test
4546
run: |
4647
cd test
@@ -53,7 +54,7 @@ jobs:
5354
test-windows:
5455
runs-on: windows-latest
5556
steps:
56-
- uses: actions/checkout@v1
57+
- uses: actions/checkout@v2
5758
- name: Set up JDK 11
5859
uses: actions/setup-java@v1
5960
with:
@@ -66,11 +67,12 @@ jobs:
6667
with:
6768
python-version: '3.x'
6869

69-
- name: copy lib
70+
- name: Build jar
7071
shell: cmd
7172
run: |
72-
mkdir -p %USERPROFILE%\.ghidra\.ghidra_9.1.2_PUBLIC\plugins
73-
copy lib\target\libdwarf.jar %USERPROFILE%\.ghidra\.ghidra_9.1.2_PUBLIC\plugins
73+
cd lib
74+
bash fetch_libs_and_build.sh
75+
move target\libdwarf.jar ..\src
7476
7577
- name: test
7678
shell: cmd

lib/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
target/*
2-
!target/libdwarf.jar
1+
target/
2+
src/main/resources/
33
.classpath
44
.project
55
.settings/

0 commit comments

Comments
 (0)