From 4398b8ac31a81fabe96f4368ca641698f6da24c1 Mon Sep 17 00:00:00 2001 From: Capa Bot Date: Mon, 11 Nov 2024 15:21:56 +0000 Subject: [PATCH 1/3] Sync capa-testfiles submodule --- tests/data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c632d594a6bee96e6d370e17e8a2ba3ccf9788f4 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 11 Nov 2024 16:42:26 +0100 Subject: [PATCH 2/3] Use macOS 13 (#2488) * update to macos-13 --- .github/workflows/build.yml | 2 +- .github/workflows/tests.yml | 2 +- CHANGELOG.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) 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) From 7b32706bd49ca928d1749dd87c2b178c1eeffddc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:42:57 +0100 Subject: [PATCH 3/3] build(deps): bump psutil from 6.0.0 to 6.1.0 (#2478) Bumps [psutil](https://github.com/giampaolo/psutil) from 6.0.0 to 6.1.0. - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](https://github.com/giampaolo/psutil/compare/release-6.0.0...release-6.1.0) --- updated-dependencies: - dependency-name: psutil dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Moritz --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0a8c0826c..2ed28eaac 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",