Compare commits

..

3 Commits

Author SHA1 Message Date
Patrick McCarty a3f2351225 Adopt strict policy for koji submissions
Because there have been very few situations in the past requiring a
"make koji" from a branch other than master, add a strict check that the
active local branch is "master". This also blocks submissions from a
"detached" state, which was previously permitted.

Also, fix and consolidate the git push commands into one. Now that the
branch check is implemented, the "master" refspec can be used, and
explicitly push *one* tag (the tag created immediately before the push).
The --follow-tags and --tags options don't have the intended effect, so
omit them.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-01-12 14:43:19 -08:00
clrbuilder a96e245866 Update packages file for version 20310
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-01-12 06:00:54 -08:00
clrbuilder ed31b0d4d7 Update packages file for version 20300
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-01-11 12:00:56 -08:00
2 changed files with 12 additions and 2 deletions
+5 -2
View File
@@ -238,10 +238,13 @@ prekoji-checks:
koji: prekoji-checks kojidef
@$(MAKE) spdxcheck
@$(MAKE) checkblacklist
@if ! git branch | grep -q -E '^\* master'; then \
echo "Error: Must be on the master branch to submit to koji" >&2; \
exit 1; \
fi
git pull --rebase
git tag $(SRPMVERS)
git push --follow-tags
git push --tags
git push origin master refs/tags/$(SRPMVERS)
$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
#help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
+7
View File
@@ -154,6 +154,7 @@ compat-libical-soname2
compat-libpng-soname12
compat-libwebp-soname6
compat-llvm-soname4
compat-mpfr-soname4
compat-opencv-soname32
compat-opencv-soname33
compat-readline
@@ -531,10 +532,12 @@ libatasmart
libatomic_ops
libb64
libblockdev
libburn
libbytesize
libcanberra
libcap
libcap-ng
libcdio
libcgroup
libcomps
libconfig
@@ -572,6 +575,7 @@ libICE
libidn
libinput
libiscsi
libisofs
libjpeg-turbo
libjpeg-turbo-soname8
libksba
@@ -988,6 +992,7 @@ powertop
presentproto
pretend
prettytable
proc-macro2
processor-trace
procps-ng
prompt_toolkit
@@ -1349,6 +1354,7 @@ tzdata
tzlocal
udisks2
uhttpmock
unicode-xid
unifdef
unittest2
unzip
@@ -1433,6 +1439,7 @@ xf86bigfontproto
xf86dgaproto
xf86driproto
xf86vidmodeproto
xfburn
xfce4-appfinder
xfce4-dev-tools
xfce4-notifyd