Skip to content

Commit

Permalink
F38 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiomb2 committed Apr 18, 2023
1 parent a370be3 commit 13d9869
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 16 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Tue Apr 18 2023 Sérgio Basto <[email protected]> - 38.1-1
- F38 GA

* Wed Feb 22 2023 Sérgio Basto <[email protected]> - 38.0-1
- F38 Branched

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=38.0
VERSION=38.1
RELEASE=1

.ONESHELL: # Applies to every targets in the file!
Expand Down
8 changes: 3 additions & 5 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ pushd ..
git clone https://github.com/rpm-software-management/mock.git
popd
pushd ../mock/mock-core-configs
git pull
git tag | grep mock-core-configs | tail -n1
#git reset --hard %{name}-%{version}
#(example: git reset --hard mock-core-configs-29.2-1)
git fetch
#git tag | grep mock-core-configs | tail -n1
git reset --hard $(git tag | grep mock-core-configs | tail -n1)
popd

Expand Down Expand Up @@ -84,9 +82,9 @@ git show
rfpkg push && rfpkg build --nowait

# Build other branches
git checkout f38 && git merge master && git push && rfpkg build --nowait; git checkout master
git checkout f37 && git merge master && git push && rfpkg build --nowait; git checkout master
git checkout f36 && git merge master && git push && rfpkg build --nowait; git checkout master
git checkout f35 && git merge master && git push && rfpkg build --nowait; git checkout master
git checkout el9 && git merge master && git push && rfpkg build --nowait; git checkout master
git checkout el8 && git merge master && git push && rfpkg build --nowait; git checkout master
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_free-38-aarch64.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora-38-aarch64.cfg')
include('templates/rpmfusion_free-branched.tpl')
include('templates/rpmfusion_free-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_free-38-i386.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora-38-i386.cfg')
include('templates/rpmfusion_free-branched.tpl')
include('templates/rpmfusion_free-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_free-38-ppc64le.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora-38-ppc64le.cfg')
include('templates/rpmfusion_free-branched.tpl')
include('templates/rpmfusion_free-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_free-38-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora-38-x86_64.cfg')
include('templates/rpmfusion_free-branched.tpl')
include('templates/rpmfusion_free-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_nonfree-38-aarch64.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora+rpmfusion_free-38-aarch64.cfg')
include('templates/rpmfusion_nonfree-branched.tpl')
include('templates/rpmfusion_nonfree-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_nonfree-38-i386.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora+rpmfusion_free-38-i386.cfg')
include('templates/rpmfusion_nonfree-branched.tpl')
include('templates/rpmfusion_nonfree-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_nonfree-38-ppc64le.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora+rpmfusion_free-38-ppc64le.cfg')
include('templates/rpmfusion_nonfree-branched.tpl')
include('templates/rpmfusion_nonfree-stable.tpl')
2 changes: 1 addition & 1 deletion etc/mock/fedora+rpmfusion_nonfree-38-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include('fedora+rpmfusion_free-38-x86_64.cfg')
include('templates/rpmfusion_nonfree-branched.tpl')
include('templates/rpmfusion_nonfree-stable.tpl')
4 changes: 2 additions & 2 deletions round.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh

ARCHES="i386 x86_64 aarch64 armhfp ppc64le"
FVERSION="35 36 37"
BRANCHED="38"
FVERSION="35 36 37 38"
BRANCHED=""
RAWHIDE="39"
REPOS="rpmfusion_free rpmfusion_nonfree"
etc_mock=../mock/mock-core-configs/etc/mock
Expand Down

0 comments on commit 13d9869

Please sign in to comment.