Skip to content

Commit 9ed523b

Browse files
ggtakecggtakec
authored
Merge pull request #134 from ggtakec/update_scripts
Updated build_helper.sh for fixing a bug and installing ruby
2 parents 0dde112 + 7f7b250 commit 9ed523b

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎.github/workflows/build_helper.sh

+16-16
Original file line numberDiff line numberDiff line change
@@ -1100,11 +1100,11 @@ if [ "${CI_DO_PUBLISH}" -eq 1 ]; then
11001100
PRNERR "Failed to install SCL packages"
11011101
exit 1
11021102
fi
1103-
if ({ RUNCMD "${INSTALLER_BIN}" "${INSTALL_CMD}" "${INSTALL_CMD_ARG}" "${INSTALL_AUTO_ARG}" "${INSTALL_QUIET_ARG}" rh-ruby26 rh-ruby26-ruby-devel rh-ruby26-rubygem-rake || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1103+
if ({ RUNCMD "${INSTALLER_BIN}" "${INSTALL_CMD}" "${INSTALL_CMD_ARG}" "${INSTALL_AUTO_ARG}" "${INSTALL_QUIET_ARG}" rh-ruby27 rh-ruby27-ruby-devel rh-ruby27-rubygem-rake || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
11041104
PRNERR "Failed to install ruby packages"
11051105
exit 1
11061106
fi
1107-
. /opt/rh/rh-ruby26/enable
1107+
. /opt/rh/rh-ruby27/enable
11081108

11091109
if ({ RUNCMD "${GEM_BIN}" "${GEM_INSTALL_CMD}" package_cloud || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
11101110
PRNERR "Failed to install packagecloud.io upload tools"
@@ -1132,16 +1132,16 @@ if [ "${CI_DO_PUBLISH}" -eq 1 ]; then
11321132
PRNERR "Failed to reset ruby module"
11331133
exit 1
11341134
fi
1135-
if ({ RUNCMD "${INSTALLER_BIN}" module "${INSTALL_AUTO_ARG}" install ruby:2.6 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1136-
PRNERR "Failed to install ruby 2.6 module"
1135+
if ({ RUNCMD "${INSTALLER_BIN}" module "${INSTALL_AUTO_ARG}" install ruby:2.7 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1136+
PRNERR "Failed to install ruby 2.7 module"
11371137
exit 1
11381138
fi
1139-
if ({ RUNCMD "${INSTALLER_BIN}" module "${INSTALL_AUTO_ARG}" enable ruby:2.6 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1140-
PRNERR "Failed to enable ruby 2.6 module"
1139+
if ({ RUNCMD "${INSTALLER_BIN}" module "${INSTALL_AUTO_ARG}" enable ruby:2.7 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1140+
PRNERR "Failed to enable ruby 2.7 module"
11411141
exit 1
11421142
fi
1143-
if ({ RUNCMD "${INSTALLER_BIN}" module "${INSTALL_AUTO_ARG}" update ruby:2.6 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1144-
PRNERR "Failed to update ruby 2.6 module"
1143+
if ({ RUNCMD "${INSTALLER_BIN}" module "${INSTALL_AUTO_ARG}" update ruby:2.7 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1144+
PRNERR "Failed to update ruby 2.7 module"
11451145
exit 1
11461146
fi
11471147

@@ -1159,10 +1159,10 @@ if [ "${CI_DO_PUBLISH}" -eq 1 ]; then
11591159
#
11601160

11611161
#
1162-
# Set RVM(Ruby Version Manager) and install Ruby 2.6 and package_cloud
1162+
# Set RVM(Ruby Version Manager) and install Ruby 2.7 and package_cloud
11631163
#
11641164
# [NOTE]
1165-
# Install Ruby2.6 using RVM tools.
1165+
# Install Ruby2.7 using RVM tools.
11661166
# Installation and running RVM tools must be done in Bash.
11671167
# This set of installations will create a Bash script and run it.
11681168
#
@@ -1175,7 +1175,7 @@ if [ "${CI_DO_PUBLISH}" -eq 1 ]; then
11751175
# command curl -sSL https://rvm.io/mpapis.asc | sudo gpg --import -
11761176
# command curl -sSL https://rvm.io/pkuczynski.asc | sudo gpg --import -
11771177
#
1178-
# After that, install RVM installation, RVM environment settings, Ruby2.6 installation, and package_cloud tools.
1178+
# After that, install RVM installation, RVM environment settings, Ruby2.7 installation, and package_cloud tools.
11791179
#
11801180
# [NOTE]
11811181
# The RVM installation requires running from a bash shell.
@@ -1211,12 +1211,12 @@ if [ "${CI_DO_PUBLISH}" -eq 1 ]; then
12111211
echo ' echo "Failed to add rvm user to root group."'
12121212
echo ' exit 1'
12131213
echo 'fi'
1214-
echo 'if ! rvm install ruby-2.6 2>&1; then'
1215-
echo ' echo "Failed to install ruby 2.6."'
1214+
echo 'if ! rvm install ruby-2.7 2>&1; then'
1215+
echo ' echo "Failed to install ruby 2.7."'
12161216
echo ' exit 1'
12171217
echo 'fi'
1218-
echo 'if ! rvm --default use ruby-2.6 2>&1; then'
1219-
echo ' echo "Failed to set ruby 2.6 as default."'
1218+
echo 'if ! rvm --default use ruby-2.7 2>&1; then'
1219+
echo ' echo "Failed to set ruby 2.7 as default."'
12201220
echo ' exit 1'
12211221
echo 'fi'
12221222
echo ''
@@ -1392,7 +1392,7 @@ if [ "${RUN_SHELLCHECK}" -eq 1 ]; then
13921392
#
13931393
# Rocky
13941394
#
1395-
if ! LATEST_SHELLCHECK_DOWNLOAD_URL=$("${CURLCMD}" -s -S https://api.github.com/repos/koalaman/shellcheck/releases/latest | grep '"browser_download_url"' | grep 'linux.x86_64' | sed -e 's|"||g' -e 's|^.*browser_download_url:[[:space:]]*||g' -e 's|^[[:space:]]*||g' -e 's|[[:space:]]*$||g' | tr -d '\n'); then
1395+
if ! LATEST_SHELLCHECK_DOWNLOAD_URL=$("${CURLCMD}" -s -S https://api.github.com/repos/koalaman/shellcheck/releases/latest | tr '{' '\n' | tr '}' '\n' | tr '[' '\n' | tr ']' '\n' | tr ',' '\n' | grep '"browser_download_url"' | grep 'linux.x86_64' | sed -e 's|"||g' -e 's|^.*browser_download_url:[[:space:]]*||g' -e 's|^[[:space:]]*||g' -e 's|[[:space:]]*$||g' | tr -d '\n'); then
13961396
PRNERR "Failed to get shellcheck download url path"
13971397
exit 1
13981398
fi

‎buildutils/chmpx.spec.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ License: @PKGLICENSE@
5858
@RPMPKG_GROUP@
5959
URL: https://@GIT_DOMAIN@/@GIT_ORG@/@PACKAGE_NAME@
6060
Source0: https://@GIT_DOMAIN@/@GIT_ORG@/@PACKAGE_NAME@/archive/%{gittag}/%{name}-%{version}.tar.gz
61-
Requires: k2hash%{?_isa} >= 1.0.91, libfullock%{?_isa} >= 1.0.55, nss-tools
61+
Requires: k2hash%{?_isa} >= 1.0.92, libfullock%{?_isa} >= 1.0.57, nss-tools
6262
%if 0%{?rhel} == 6
63-
BuildRequires: git-core gcc-c++ make libtool k2hash-devel >= 1.0.91, libfullock-devel >= 1.0.55, libyaml-devel, nss-devel
63+
BuildRequires: git-core gcc-c++ make libtool k2hash-devel >= 1.0.92, libfullock-devel >= 1.0.57, libyaml-devel, nss-devel
6464
%else
65-
BuildRequires: systemd git-core gcc-c++ make libtool k2hash-devel >= 1.0.91, libfullock-devel >= 1.0.55, libyaml-devel, nss-devel
65+
BuildRequires: systemd git-core gcc-c++ make libtool k2hash-devel >= 1.0.92, libfullock-devel >= 1.0.57, libyaml-devel, nss-devel
6666
%endif
6767

6868
%description
@@ -134,7 +134,7 @@ rm -rf %{buildroot}
134134
#
135135
%package devel
136136
Summary: @SHORTDESC@ (development)
137-
Requires: %{name}%{?_isa} = %{version}-%{release}, k2hash-devel%{?_isa} >= 1.0.91, libfullock-devel%{?_isa} >= 1.0.55, libyaml-devel, nss-devel
137+
Requires: %{name}%{?_isa} = %{version}-%{release}, k2hash-devel%{?_isa} >= 1.0.92, libfullock-devel%{?_isa} >= 1.0.57, libyaml-devel, nss-devel
138138

139139
%description devel
140140
Development package for building with @PACKAGE_NAME@ shared library.

‎buildutils/control.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: @PACKAGE_NAME@
22
Section: net
33
Priority: optional
44
Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
5-
Build-Depends: @DEBHELPER_DEP@, k2hash-dev (>= 1.0.91), libfullock-dev (>= 1.0.55), libyaml-dev, gnutls-dev
5+
Build-Depends: @DEBHELPER_DEP@, k2hash-dev (>= 1.0.92), libfullock-dev (>= 1.0.57), libyaml-dev, gnutls-dev
66
Standards-Version: 3.9.8
77
Homepage: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
88
Vcs-Git: git://@GIT_DOMAIN@/@GIT_ORG@/@[email protected]
@@ -11,14 +11,14 @@ Vcs-Browser: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
1111
Package: @PACKAGE_NAME@-dev
1212
Section: devel
1313
Architecture: amd64
14-
Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), k2hash-dev (>= 1.0.91), libfullock-dev (>= 1.0.55), libyaml-dev, gnutls-dev
14+
Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), k2hash-dev (>= 1.0.92), libfullock-dev (>= 1.0.57), libyaml-dev, gnutls-dev
1515
Description: @SHORTDESC@ (development)
1616
Development package for building with @PACKAGE_NAME@ shared library.
1717
This package has header files and symbols for it.
1818

1919
Package: @PACKAGE_NAME@
2020
Section: net
2121
Architecture: amd64
22-
Depends: ${shlibs:Depends}, ${misc:Depends}, init-system-helpers (>= 1.14), k2hash (>= 1.0.91), libfullock (>= 1.0.55)
22+
Depends: ${shlibs:Depends}, ${misc:Depends}, init-system-helpers (>= 1.14), k2hash (>= 1.0.92), libfullock (>= 1.0.57)
2323
Description: @SHORTDESC@
2424
@DEBLONGDESC@

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ AC_ARG_ENABLE(check-depend-libs,
235235
esac]
236236
)
237237
AS_IF([test ${check_depend_libs} = 1], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
238-
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.91], [], [AC_MSG_ERROR(not found k2hash package)])])
239-
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.55], [], [AC_MSG_ERROR(not found libfullock package)])])
238+
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.92], [], [AC_MSG_ERROR(not found k2hash package)])])
239+
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.57], [], [AC_MSG_ERROR(not found libfullock package)])])
240240

241241
#
242242
# CFLAGS/CXXFLAGS

0 commit comments

Comments
 (0)