Merge pull request #79 from chaoticgd/ghidra11.2

Add support for Ghidra 11.2
chaoticgd · Sep 28, 2024 · 0b0ea2a · 0b0ea2a
2 parents 8a6149f + f659760
commit 0b0ea2a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 38 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,16 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghidra:  ["11.1.2"]
+        ghidra: ["11.2", "11.1.2"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: "17"
-          java-package: jdk
-          architecture: x64
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: "8.10"
       - name: Setup Ghidra
         uses: antoniovazquezblanco/setup-ghidra@cacffdd46c5f53356e6a7822a2743a39f57d1958
         with:
@@ -28,15 +31,9 @@ jobs:
       - name: Download stdump
         run: bash ./os/download.sh
       - name: Test
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 7.6
-          arguments: test -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
+        run: gradle -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }} test
       - name: Build Extension
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 7.6
-          arguments: buildExtension -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
+        run: gradle -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }} buildExtension
       - name: Release
         uses: svenstaro/[email protected]
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,23 +7,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghidra: ["11.1.2"]
+        ghidra: ["11.2", "11.1.2"]
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: "17"
-          java-package: jdk
-          architecture: x64
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: "8.10"
       - name: Setup Ghidra
         uses: antoniovazquezblanco/setup-ghidra@cacffdd46c5f53356e6a7822a2743a39f57d1958
         with:
           auth_token: ${{ secrets.GITHUB_TOKEN }}
           version: ${{ matrix.ghidra }}
       - name: Test
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 7.6
-          arguments: test -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
+        run: gradle -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }} test
diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml
@@ -10,33 +10,28 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghidra:  ["11.1.2"]
+        ghidra: ["11.2", "11.1.2"]
     steps:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: "17"
-          java-package: jdk
-          architecture: x64
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: "8.10"
       - name: Setup Ghidra
         uses: antoniovazquezblanco/setup-ghidra@cacffdd46c5f53356e6a7822a2743a39f57d1958
         with:
           auth_token: ${{ secrets.GITHUB_TOKEN }}
           version: ${{ matrix.ghidra }}
       - name: Download stdump
         run: bash ./os/download.sh
-      - name: Test
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 7.6
-          arguments: test -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
       - name: Build Extension
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 7.6
-          arguments: buildExtension -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }}
+        run: gradle -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }} buildExtension
       - name: Release
         uses: svenstaro/[email protected]
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.1.20
+
+- Added support for Ghidra 11.2.
+
 ## v2.1.19
 
 - Fixed a relocation regression introduced in v2.1.17 where Ghidra's built-in MIPS relocation handler would take priority over the one included with the extension.

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This extension is based on the original [ghidra-emotionengine](https://github.co
 - Recover data types, functions and global variables from ELF files with `.mdebug` sections with the included STABS Analyzer.
 - Import PCSX2 save states.
 - Fix references to global variables with the MIPS-R5900 Constant Reference Analyzer.
-- Support for Ghidra 11.1.2.
+- Support for Ghidra 11.2.
 
 ## Installation