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 SPEC changelog, and check for warnings from rpmbuild - v1.8.x #5370

Merged
merged 3 commits into from
Jul 7, 2020
Merged

Fix SPEC changelog, and check for warnings from rpmbuild - v1.8.x #5370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26375ed
CI: Check for warnings from rpmbuild
yosefe Jul 7, 2020
b1abf9e
SPEC: Fix changelog day-of-week
yosefe Jul 7, 2020
9f07655
NEWS: Update release version to v1.8.1-rc4
yosefe Jul 7, 2020
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 NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##
#

## 1.8.1-RC2 (July 2, 2020)
## 1.8.1-rc4 (July 7, 2020)
### Features:
- Added binary release pipeline in Azure CI

Expand Down
13 changes: 10 additions & 3 deletions buildlib/azure-pipelines-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ stages:

# Test RPM build
- job: build_rpm
displayName: build tarball and source rpm
displayName: Build tarball and source rpm
container: fedora
steps:
- checkout: self
Expand All @@ -144,8 +144,15 @@ stages:
set -eE
gcc --version
./contrib/configure-release
./contrib/buildrpm.sh -s -t -b
displayName: Build tarball
stdbuf -e0 -o0 ./contrib/buildrpm.sh -s -t -b |& tee rpmbuild.log
pattern='^warning: '
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont think pattern ^warning: is correct, it searches from col #1 of str, while warning: in log file prefixed with file:line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the log file does not have timestamp prefix (only AZP adds it later)
i any case, i've tested that when SPEC is wrong, it finds it: https://github.com/openucx/ucx/runs/845557002

if grep -q "$pattern" rpmbuild.log; then
echo "rpm build generated warnings:"
grep "$pattern" rpmbuild.log
echo "##vso[task.logissue type=error]rpm build generated warnings"
echo "##vso[task.complete result=Failed;]"
fi
displayName: Configure source and build RPM

- stage: Tests
dependsOn: [Codestyle]
Expand Down
2 changes: 1 addition & 1 deletion ucx.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ process to map the memory of another process into its virtual address space.


%changelog
* Thu Jul 1 2020 Yossi Itigin <yosefe@mellanox.com> 1.8.1-1
* Wed Jul 1 2020 Yossi Itigin <yosefe@mellanox.com> 1.8.1-1
- Bump version to 1.8.1
* Sun Sep 22 2019 Yossi Itigin <yosefe@mellanox.com> 1.8.0-1
- Bump version to 1.8.0
Expand Down