From e631cc45b251e8e4883851eeee7a74b3d15b9092 Mon Sep 17 00:00:00 2001 From: Manu <3916435+m3nu@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:54:41 +0100 Subject: [PATCH] Bump Borg version for integration test (#2097) --- .github/scripts/generate-matrix.sh | 4 ++-- .github/workflows/build-macos.yml | 2 +- tests/integration/test_diff.py | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/scripts/generate-matrix.sh b/.github/scripts/generate-matrix.sh index 1f8a3558f..fbaa92cc8 100644 --- a/.github/scripts/generate-matrix.sh +++ b/.github/scripts/generate-matrix.sh @@ -11,7 +11,7 @@ if [[ "$event_name" == "workflow_dispatch" ]] || [[ "$branch_name" == "master" ] echo '{ "python-version": ["3.11"], "os": ["ubuntu-22.04"], - "borg-version": ["1.1.18", "1.2.8", "1.4.0", "2.0.0b12"], + "borg-version": ["1.1.18", "1.2.8", "1.4.0"], "exclude": [{"borg-version": "2.0.0b12", "python-version": "3.8"}] }' | jq -c . > matrix-integration.json @@ -25,6 +25,6 @@ elif [[ "$event_name" == "push" ]] || [[ "$event_name" == "pull_request" ]]; the echo '{ "python-version": ["3.11"], "os": ["ubuntu-22.04"], - "borg-version": ["1.2.8"] + "borg-version": ["1.4.0"] }' | jq -c . > matrix-integration.json fi diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 87de5af75..d927ded04 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -13,7 +13,7 @@ on: macos_version: description: 'macOS version for building' required: true - default: 'macos-12' + default: 'macos-14' jobs: build: diff --git a/tests/integration/test_diff.py b/tests/integration/test_diff.py index 97ca6fb78..6d5ac491f 100644 --- a/tests/integration/test_diff.py +++ b/tests/integration/test_diff.py @@ -32,7 +32,7 @@ "modified": None, }, "min_version": "1.2.4", - "max_version": "1.2.8", + "max_version": "1.4.0", }, { "subpath": "file", @@ -42,7 +42,7 @@ "modified": (0, 0), }, "min_version": "1.2.4", - "max_version": "1.2.8", + "max_version": "1.4.0", }, { "subpath": "chrdev", @@ -91,7 +91,7 @@ "modified": None, }, "min_version": "1.2.4", - "max_version": "1.2.8", + "max_version": "1.4.0", }, { "subpath": "dir", @@ -191,7 +191,7 @@ "change_type": ChangeType.MODIFIED, }, "min_version": "1.2.4", - "max_version": "1.2.8", + "max_version": "1.4.0", }, { "subpath": "chrdev", @@ -276,7 +276,7 @@ "change_type": ChangeType.MODIFIED, }, "min_version": "1.2.4", - "max_version": "1.2.8", + "max_version": "1.4.0", }, { "subpath": "chrdev1", @@ -326,7 +326,7 @@ "change_type": ChangeType.MODIFIED, }, "min_version": "1.2.4", - "max_version": "1.2.8", + "max_version": "1.4.0", }, ], ),