Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion common/CI/package_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def commit_message(self, ref: str) -> str:
return self.run('log', '-1', '--format=%B', ref)

def commit_refs(self, base: str, head: str) -> List[str]:
return self.run_lines('log', '--pretty=%H', base + '..' + head)
return self.run_lines('log', '--no-merges', '--pretty=%H', base + '..' + head)

def fetch(self, remote: List[str]) -> None:
self.run('fetch', *remote)
Expand Down
6 changes: 5 additions & 1 deletion packages/f/flatpak/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ builddeps :
- pkgconfig(libzstd)
- pkgconfig(ostree-1)
- pkgconfig(xau)
- xmlto
- pyparsing
- bubblewrap
checkdeps :
- pyparsing
- xmlto
- bubblewrap
rundeps :
- xmlto
- bubblewrap
setup : |
NOCONFIGURE=1 %autogen
Expand Down
2 changes: 1 addition & 1 deletion packages/n/nginx/package.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name : nginx
version : 1.25.2
release : 45
release : 46
source :
- https://nginx.org/download/nginx-1.25.2.tar.gz : 05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711
license : BSD-2-Clause
Expand Down