Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix integration test & allow skipping changelog #224

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Fix integration test & allow skipping changelog #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7459fe6
fix integration test fail on deprecation msg
mjurbanski-reef Nov 23, 2023
62d09a2
add skip-changelog label support
mjurbanski-reef Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions changelog.d/+skip_changelog.infrastructure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Allow skipping changelog for PRs marked with `-changelog` label.

2 changes: 1 addition & 1 deletion test/integration/test_b2_command_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading