diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0935182f9..148208810 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: artifact_name: capa.exe asset_name: windows python_version: '3.10' - - os: macos-12 + - os: macos-13 # use older macOS for assumed better portability artifact_name: capa asset_name: macos diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bbb39ff7b..eb95381e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,7 +88,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-20.04, windows-2019, macos-13] # across all operating systems python-version: ["3.10", "3.11"] include: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8124e8c66..961dcae1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - fix saving of base address @mr-tz ### Development +- CI: use macos-13 since macos-12 is deprecated and will be removed on December 3rd, 2024 #2173 @mr-tz ### Raw diffs - [capa v7.4.0...master](https://github.com/mandiant/capa/compare/v7.4.0...master) diff --git a/pyproject.toml b/pyproject.toml index 45103251a..c5553c166 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -156,7 +156,7 @@ build = [ ] scripts = [ "jschema_to_python==1.2.3", - "psutil==6.0.0", + "psutil==6.1.0", "stix2==3.0.1", "sarif_om==1.0.4", "requests==2.32.3", diff --git a/tests/data b/tests/data index 36bae7a84..40dce09a5 160000 --- a/tests/data +++ b/tests/data @@ -1 +1 @@ -Subproject commit 36bae7a843ab209029d58f509a46154fe592c548 +Subproject commit 40dce09a589195bd55bc83fd5e9c1a809ad6f3aa