Skip to content

Commit 7a25cf2

Browse files
authored
Merge pull request #5370 from yosefe/topic/ci-check-for-warnings-from-rpmbuild
Fix SPEC changelog, and check for warnings from rpmbuild - v1.8.x
2 parents 6e56c21 + 9f07655 commit 7a25cf2

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
##
88
#
99

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

buildlib/azure-pipelines-pr.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ stages:
131131
132132
# Test RPM build
133133
- job: build_rpm
134-
displayName: build tarball and source rpm
134+
displayName: Build tarball and source rpm
135135
container: fedora
136136
steps:
137137
- checkout: self
@@ -144,8 +144,15 @@ stages:
144144
set -eE
145145
gcc --version
146146
./contrib/configure-release
147-
./contrib/buildrpm.sh -s -t -b
148-
displayName: Build tarball
147+
stdbuf -e0 -o0 ./contrib/buildrpm.sh -s -t -b |& tee rpmbuild.log
148+
pattern='^warning: '
149+
if grep -q "$pattern" rpmbuild.log; then
150+
echo "rpm build generated warnings:"
151+
grep "$pattern" rpmbuild.log
152+
echo "##vso[task.logissue type=error]rpm build generated warnings"
153+
echo "##vso[task.complete result=Failed;]"
154+
fi
155+
displayName: Configure source and build RPM
149156
150157
- stage: Tests
151158
dependsOn: [Codestyle]

ucx.spec.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ process to map the memory of another process into its virtual address space.
300300

301301

302302
%changelog
303-
* Thu Jul 1 2020 Yossi Itigin <[email protected]> 1.8.1-1
303+
* Wed Jul 1 2020 Yossi Itigin <[email protected]> 1.8.1-1
304304
- Bump version to 1.8.1
305305
* Sun Sep 22 2019 Yossi Itigin <[email protected]> 1.8.0-1
306306
- Bump version to 1.8.0

0 commit comments

Comments
 (0)