Skip to content

Commit

Permalink
Removed Centos7 support temporarily
Browse files Browse the repository at this point in the history
  • Loading branch information
gornostal committed May 12, 2019
1 parent c65f5f4 commit 3c3e666
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 27 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ deploy:
- ulauncher_${TRAVIS_TAG}_all.deb
- ulauncher_${TRAVIS_TAG}_fedora28.rpm
- ulauncher_${TRAVIS_TAG}_fedora29.rpm
- ulauncher_${TRAVIS_TAG}_centos7.rpm
skip_cleanup: true
on:
repo: Ulauncher/Ulauncher
Expand Down
6 changes: 2 additions & 4 deletions scripts/help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ The commands below are useful for maintainers:
${bold}./ul build-rpm <VERSION> <DISTRO_NAME> [FILE_SUFFIX]
${dim}Builds an rpm package
DISTRO_NAME is a required second argument and can take one of this values: feodra, centos7
FILE_SUFFIX is an optional argument. By default, file suffix is DISTRO_NAME
In order to build for centos7 use fedora28 as an image (see help for dev-container command)${normal}
DISTRO_NAME is a required second argument and can take one of this values: feodra, suse, centos
FILE_SUFFIX is an optional argument. By default, file suffix is DISTRO_NAME${normal}
${bold}./ul build-targz <VERSION>
${dim}Builds a targz archive with the source code${normal}
Expand Down
5 changes: 1 addition & 4 deletions scripts/make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,13 @@ create_rpms() {
# We know that
# Fedora 28 has Python 3.6
# Fedora 29 and 30 has Python 3.7
# Centos7 has Python 3.6
# This means that we should use separate docker images to build different RPM packages
# However we can build RPM for Fedora 28 and Centos7 using the same image

set -ex

docker run -v $(pwd):/root/ulauncher --name ulauncher-rpm $FEDORA_28_BUILD_IMAGE \
bash -c "./ul build-rpm $VERSION fedora fedora28 && ./ul build-rpm $VERSION centos7"
bash -c "./ul build-rpm $VERSION fedora fedora28"
docker cp ulauncher-rpm:/tmp/ulauncher_${VERSION}_fedora28.rpm .
docker cp ulauncher-rpm:/tmp/ulauncher_${VERSION}_centos7.rpm .
docker rm ulauncher-rpm

docker run -v $(pwd):/root/ulauncher --name ulauncher-rpm $FEDORA_29_BUILD_IMAGE \
Expand Down
18 changes: 0 additions & 18 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,3 @@ requires = gobject-introspection
python3-inotify
python3-Levenshtein
python3-websocket-client

[bdist_rpm_centos7]
release = 1
packager = Aleksandr Gornostal <ulauncher.app@gmail.com>
doc_files = LICENSE
group = Applications/Productivity
build_requires = gcc,make,python3-distutils-extra
requires = python3 >= 3.5
gobject-introspection
python3-gobject
keybinder3
libappindicator-gtk3
webkitgtk4
dbus-python3
python3-pyxdg
python3-inotify
python3-Levenshtein
python3-websocket-client

0 comments on commit 3c3e666

Please sign in to comment.