Allow build on MacOS (MX) #30
Merged
+500
−192
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DarkaMaul
force-pushed
the
build/mac-os
branch
5 times, most recently
from
5264981 to
3deee28
Compare
patacca
requested changes
Apr 29, 2024
There was a problem hiding this comment.
Good job! I just have added a few remarks, mostly because I think it's better if we don't pin specific minor versions of github actions so we can benefit from the latest versions without having to manually update them.
Nice refactoring on the cmake part as well!
.github/workflows/build.yml
Outdated
|
|
||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4.1.1 |
There was a problem hiding this comment.
Suggested change
| uses: actions/checkout@v4.1.1 | |
| uses: actions/checkout@v4 |
Unless there are specific reasons to pin the minor version I think it's better to just use the latest v4 so that we don't need to constantly update it
.github/workflows/build.yml
Outdated
|
|
||
| - name: Setup cmake | ||
| uses: jwlawson/actions-setup-cmake@v1.12 | ||
| uses: jwlawson/actions-setup-cmake@959f1116cf9f1ae42fff8ec1a4aaae6d4a0e348b #v2.0.1 |
There was a problem hiding this comment.
Suggested change
| uses: jwlawson/actions-setup-cmake@959f1116cf9f1ae42fff8ec1a4aaae6d4a0e348b #v2.0.1 | |
| uses: jwlawson/actions-setup-cmake@v2 |
Same as above
| # We need one action per file | ||
| # See https://github.com/actions/upload-artifact/issues/331 | ||
| - name: Upload Artifacts (64) | ||
| uses: actions/[email protected] |
There was a problem hiding this comment.
Suggested change
| uses: actions/upload-artifact@v4.3.1 | |
| uses: actions/upload-artifact@v4 |
| with: | ||
| name: idaplugin-${{ matrix.os }}-${{ matrix.ida_sdk }} | ||
| path: ${{ matrix.ida_sdk }}-quokka_plugin0064.${{ matrix.ext }} | ||
| if-no-files-found: error | ||
|
|
||
| - name: Upload Artifacts (32) | ||
| uses: actions/[email protected] |
There was a problem hiding this comment.
Suggested change
| uses: actions/upload-artifact@v4.3.1 | |
| uses: actions/upload-artifact@v4 |
.github/workflows/build.yml
Outdated
| steps: | ||
| - name: Download Artefact | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4.1.4 |
There was a problem hiding this comment.
Suggested change
| uses: actions/download-artifact@v4.1.4 | |
| uses: actions/download-artifact@v4 |
.github/workflows/build.yml
Outdated
|
|
||
| - name: Release | ||
| uses: softprops/action-gh-release@v0.1.14 | ||
| uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 #v2.0.4 |
There was a problem hiding this comment.
Suggested change
| uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 #v2.0.4 | |
| uses: softprops/action-gh-release@v2 |
proto/CMakeLists.txt
Outdated
| @@ -1,18 +1,18 @@ | |||
| include_guard() | |||
|
|
|||
| get_filename_component(hw_proto "quokka.proto" ABSOLUTE) | |||
| # get_filename_component(hw_proto "quokka.proto" ABSOLUTE) | |||
There was a problem hiding this comment.
Suggested change
| # get_filename_component(hw_proto "quokka.proto" ABSOLUTE) |
We can just remove the line if not needed
This PR allows to build quokka on MacOS. We also update the FindIdaSdk cmake module from BinExport so we support also other IDA variants. This will now both compile Quokka in 32 bits and 64 bits, closing outstanding issues. This has been tested on a MacOS M2 computer (and it works).
# Please enter the commit message for your changes. Lines starting
patacca
force-pushed
the
build/mac-os
branch
from
3deee28 to
f80877e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR allows to build quokka on MacOS.
We also update the FindIdaSdk cmake module from BinExport so we support also other IDA variants.
This will now both compile Quokka in 32 bits and 64 bits, closing outstanding issues (#24).
This has been tested on a MacOS M2 computer (and it works).