Skip to content

Commit

Permalink
ci: update macos to match the latest wireshark changes for dmg
Browse files Browse the repository at this point in the history
Getting CI errors on the dmg build, so push forward to match
the upstream wireshark changes - looks like the dmgbuild is now
installed external to the brew setup.

No functional change

Signed-off-by: Charles Hardin <charles.hardin@chargepoint.com>
  • Loading branch information
chardin-cpi committed May 2, 2024
1 parent 0394b23 commit 1b77c04
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ on:

env:
WIRESHARK_BRANCH: release-4.2
WIRESHARK_QT_VERSION: 5.15.3

jobs:
intree:
name: Build in-tree plugin
runs-on: macos-11.0
runs-on: macos-latest
steps:
- name: Checkout Wireshark
run: |
Expand All @@ -35,14 +34,16 @@ jobs:
run: |
git apply plugins/epan/v2g/extern/wireshark-${{ env.WIRESHARK_BRANCH }}.patch
- name: Set up Python 3.8
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.11
- name: Install brew deps
run: ./tools/macos-setup-brew.sh --install-optional --install-doc-deps --install-dmg-deps --install-test-deps
env:
HOMEBREW_NO_AUTO_UPDATE: 1
- name: Install dmgbuild
run: pip3 install dmgbuild
- name: Build in-tree
run: |
mkdir build
Expand Down

0 comments on commit 1b77c04

Please sign in to comment.