Skip to content

Commit 5a498e5

Browse files
EBP-304: smf plugin dependency fix (#29)
* Update macos_arm64.yml Install dependency manually * Update macos_arm64.yml update to use bash shell * Update macos_arm64.yml * Update macos_arm64.yml * Update build_plugin.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update CMakeLists.txt * Update CMakeLists.txt * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update build_plugin.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml * Update macos_arm64.yml Update dependency path for the smf.so plugin
1 parent 0dd3aca commit 5a498e5

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

.github/workflows/macos_arm64.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
ln -s ${{ github.workspace }}/src/smf ${{ github.workspace }}/wireshark/plugins/epan/smf
7070
7171
- name: Mkdir
72-
run: mkdir build
72+
run: mkdir -p build
7373

7474
- name: Cmake
7575
working-directory: build
@@ -83,18 +83,24 @@ jobs:
8383
-DPython_LIBRARY=${{ env.pythonLocation }}/lib \
8484
-DPython_INCLUDE_DIR=${{ env.pythonLocation }}/include \
8585
-DPython_EXECUTABLE=${{ env.pythonLocation }}/bin/python \
86-
-DPython_FIND_STRATEGY=LOCATION
87-
86+
-DPython_FIND_STRATEGY=LOCATION
87+
8888
- name: Build
8989
working-directory: build
9090
run: ninja
9191

92-
# A compressed tarball is created for release
93-
# This means that the artifact is compressed and zipped as a result.
92+
# Update dependency path for SMF plugin to find the libraries from wireshark package
93+
- name: Update dependency path for SMF plugin
94+
run: |
95+
VERSIONED_DIR="${{ inputs.MAJOR_VERSION }}-${{ inputs.MINOR_VERSION }}"
96+
install_name_tool -change /opt/homebrew/opt/glib/lib/libglib-2.0.0.dylib @executable_path/../Frameworks/libglib-2.0.0.dylib ${{ github.workspace }}/build/run/Wireshark.app/Contents/PlugIns/wireshark/${VERSIONED_DIR}/epan/smf.so
97+
98+
# A compressed tarball is created for release.
99+
# This means that the artifact is compressed and zipped as a result.
94100
- name: Create Compressed Tarball
95101
working-directory: ${{ github.workspace }}/build/run/Wireshark.app/Contents/PlugIns/wireshark
96102
run: tar -czvf ${{ github.workspace }}/${{ env.PLUGIN_NAME }} **/epan/smf.so
97-
103+
98104
- name: Upload Artifacts
99105
uses: actions/upload-artifact@v4
100106
with:

0 commit comments

Comments
 (0)