From 7459fe67df394a9110e5abcf470be37713d3c756 Mon Sep 17 00:00:00 2001 From: Maciej Urbanski Date: Thu, 23 Nov 2023 22:32:37 +0100 Subject: [PATCH 1/2] fix integration test fail on deprecation msg --- test/integration/test_b2_command_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test_b2_command_line.py b/test/integration/test_b2_command_line.py index 5c5c0896d..2dce5e1e3 100755 --- a/test/integration/test_b2_command_line.py +++ b/test/integration/test_b2_command_line.py @@ -2742,7 +2742,7 @@ def assert_expected(file_info, expected=expected_file_info): assert_expected(copied_version['fileInfo']) download_output = b2_tool.should_succeed( - ['download-file-by-id', file_version['fileId'], tmp_path / 'downloaded_file'] + ['download-file', f"b2id://{file_version['fileId']}", tmp_path / 'downloaded_file'] ) assert re.search(r'CacheControl: *max-age=3600', download_output) assert re.search(r'ContentDisposition: *attachment', download_output) From 62d09a25057f6674a497f321ab8b528917dd3e48 Mon Sep 17 00:00:00 2001 From: Maciej Urbanski Date: Thu, 23 Nov 2023 22:40:41 +0100 Subject: [PATCH 2/2] add skip-changelog label support --- .github/workflows/ci.yml | 1 + changelog.d/+skip_changelog.infrastructure.md | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 changelog.d/+skip_changelog.infrastructure.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1781ab77a..64d7b7883 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: - name: Run linters run: nox -vs lint - name: Validate new changelog entries + if: contains(github.event.pull_request.labels.*.name, '-changelog') == false run: if [ -z "$(git diff --diff-filter=A --name-only origin/${{ github.event.pull_request.base.ref }} changelog.d)" ]; then echo no changelog item added; exit 1; fi diff --git a/changelog.d/+skip_changelog.infrastructure.md b/changelog.d/+skip_changelog.infrastructure.md new file mode 100644 index 000000000..4ec956e9b --- /dev/null +++ b/changelog.d/+skip_changelog.infrastructure.md @@ -0,0 +1,2 @@ +Allow skipping changelog for PRs marked with `-changelog` label. +