Skip to content

Commit 7e3c71a

Browse files
ggtakecggtakec
authored
Merge pull request #127 from ggtakec/update/codes
Changed support OS and Updated codes/mail addresses
2 parents e218ed9 + 28882bc commit 7e3c71a

File tree

5 files changed

+61
-19
lines changed

5 files changed

+61
-19
lines changed

‎.github/workflows/build_helper.sh‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ else
704704
fi
705705
if [ -z "${CI_DEVELOPER_EMAIL}" ]; then
706706
PRNWARN "DEVELOPER_EMAIL is not set in the options or environment variables. There is no choice but to set the default value."
707-
CI_DEVELOPER_EMAIL="antpickax-support@mail.yahoo.co.jp"
707+
CI_DEVELOPER_EMAIL="ml-antpickax-support@lycorp.co.jp"
708708
fi
709709
fi
710710

@@ -1277,7 +1277,7 @@ if [ "${RUN_CPPCHECK}" -eq 1 ]; then
12771277
fi
12781278

12791279
elif [ "${IS_OS_ROCKY}" -eq 1 ]; then
1280-
if echo "${CI_OSTYPE}" | sed -e 's#:##g' | grep -q -i 'rockylinux8'; then
1280+
if echo "${CI_OSTYPE}" | sed -e 's#:##g' | grep -q -i 'rockylinux[:]*8'; then
12811281
#
12821282
# Rocky 8
12831283
#
@@ -1293,7 +1293,7 @@ if [ "${RUN_CPPCHECK}" -eq 1 ]; then
12931293
PRNERR "Failed to enable powertools"
12941294
exit 1
12951295
fi
1296-
else
1296+
elif echo "${CI_OSTYPE}" | sed -e 's#:##g' | grep -q -i 'rockylinux[:]*9'; then
12971297
#
12981298
# Rocky 9 or later
12991299
#
@@ -1305,6 +1305,18 @@ if [ "${RUN_CPPCHECK}" -eq 1 ]; then
13051305
PRNERR "Failed to enable epel repository"
13061306
exit 1
13071307
fi
1308+
else
1309+
#
1310+
# Rocky 10 or later
1311+
#
1312+
if ({ RUNCMD "${INSTALLER_BIN}" "${INSTALL_CMD}" "${INSTALL_CMD_ARG}" "${INSTALL_AUTO_ARG}" https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1313+
PRNERR "Failed to install epel repository"
1314+
exit 1
1315+
fi
1316+
if ({ RUNCMD "${INSTALLER_BIN}" config-manager --enable epel || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
1317+
PRNERR "Failed to enable epel repository"
1318+
exit 1
1319+
fi
13081320
fi
13091321
if ({ RUNCMD "${INSTALLER_BIN}" "${INSTALL_CMD}" "${INSTALL_CMD_ARG}" "${INSTALL_AUTO_ARG}" cppcheck || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
13101322
PRNERR "Failed to install cppcheck"

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,17 @@ jobs:
6363
container:
6464
- ubuntu:24.04
6565
- ubuntu:22.04
66+
- debian:trixie
6667
- debian:bookworm
6768
- debian:bullseye
69+
- rockylinux/rockylinux:10
6870
- rockylinux:9
6971
- rockylinux:8
72+
- fedora:42
7073
- fedora:41
71-
- fedora:40
74+
- alpine:3.22
7275
- alpine:3.21
7376
- alpine:3.20
74-
- alpine:3.19
7577

7678
container:
7779
image: ${{ matrix.container }}
@@ -149,7 +151,7 @@ jobs:
149151
# <default tag flag>: If you want to use the created Docker image as the default image, specify "default".
150152
#
151153
imageinfo:
152-
- alpine:3.21,alpine:3.21,alpine,default
154+
- alpine:3.22,alpine:3.22,alpine,default
153155
- ubuntu:24.04,ubuntu:24.04,ubuntu
154156

155157
#

‎.github/workflows/ostypevars.sh‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,20 @@ elif echo "${CI_OSTYPE}" | grep -q -i -e "ubuntu:22.04" -e "ubuntu:jammy"; then
121121
PKG_EXT="deb"
122122
IS_OS_UBUNTU=1
123123

124+
elif echo "${CI_OSTYPE}" | grep -q -i -e "debian:13" -e "debian:trixie"; then
125+
DIST_TAG="debian/trixie"
126+
INSTALL_PKG_LIST="git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config ruby-dev rubygems rubygems-integration procps"
127+
INSTALLER_BIN="apt-get"
128+
UPDATE_CMD="update"
129+
UPDATE_CMD_ARG=""
130+
INSTALL_CMD="install"
131+
INSTALL_CMD_ARG=""
132+
INSTALL_AUTO_ARG="-y"
133+
INSTALL_QUIET_ARG="-qq"
134+
PKG_OUTPUT_DIR="debian_build"
135+
PKG_EXT="deb"
136+
IS_OS_DEBIAN=1
137+
124138
elif echo "${CI_OSTYPE}" | grep -q -i -e "debian:12" -e "debian:bookworm"; then
125139
DIST_TAG="debian/bookworm"
126140
INSTALL_PKG_LIST="git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config ruby-dev rubygems rubygems-integration procps"
@@ -149,6 +163,20 @@ elif echo "${CI_OSTYPE}" | grep -q -i -e "debian:11" -e "debian:bullseye"; then
149163
PKG_EXT="deb"
150164
IS_OS_DEBIAN=1
151165

166+
elif echo "${CI_OSTYPE}" | grep -q -i "rockylinux:10"; then
167+
DIST_TAG="el/10"
168+
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps"
169+
INSTALLER_BIN="dnf"
170+
UPDATE_CMD="update"
171+
UPDATE_CMD_ARG=""
172+
INSTALL_CMD="install"
173+
INSTALL_CMD_ARG=""
174+
INSTALL_AUTO_ARG="-y"
175+
INSTALL_QUIET_ARG="-q"
176+
PKG_OUTPUT_DIR="."
177+
PKG_EXT="rpm"
178+
IS_OS_ROCKY=1
179+
152180
elif echo "${CI_OSTYPE}" | grep -q -i "rockylinux:9"; then
153181
DIST_TAG="el/9"
154182
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps"
@@ -177,8 +205,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "rockylinux:8"; then
177205
PKG_EXT="rpm"
178206
IS_OS_ROCKY=1
179207

180-
elif echo "${CI_OSTYPE}" | grep -q -i "fedora:41"; then
181-
DIST_TAG="fedora/41"
208+
elif echo "${CI_OSTYPE}" | grep -q -i "fedora:42"; then
209+
DIST_TAG="fedora/42"
182210
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps"
183211
INSTALLER_BIN="dnf"
184212
UPDATE_CMD="update"
@@ -191,8 +219,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "fedora:41"; then
191219
PKG_EXT="rpm"
192220
IS_OS_FEDORA=1
193221

194-
elif echo "${CI_OSTYPE}" | grep -q -i "fedora:40"; then
195-
DIST_TAG="fedora/40"
222+
elif echo "${CI_OSTYPE}" | grep -q -i "fedora:41"; then
223+
DIST_TAG="fedora/41"
196224
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps"
197225
INSTALLER_BIN="dnf"
198226
UPDATE_CMD="update"
@@ -205,8 +233,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "fedora:40"; then
205233
PKG_EXT="rpm"
206234
IS_OS_FEDORA=1
207235

208-
elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.21"; then
209-
DIST_TAG="alpine/v3.21"
236+
elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.22"; then
237+
DIST_TAG="alpine/v3.22"
210238
INSTALL_PKG_LIST="bash sudo alpine-sdk automake autoconf libtool groff util-linux-misc musl-locales ruby-dev procps"
211239
INSTALLER_BIN="apk"
212240
UPDATE_CMD="update"
@@ -219,8 +247,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.21"; then
219247
PKG_EXT="apk"
220248
IS_OS_ALPINE=1
221249

222-
elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.20"; then
223-
DIST_TAG="alpine/v3.20"
250+
elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.21"; then
251+
DIST_TAG="alpine/v3.21"
224252
INSTALL_PKG_LIST="bash sudo alpine-sdk automake autoconf libtool groff util-linux-misc musl-locales ruby-dev procps"
225253
INSTALLER_BIN="apk"
226254
UPDATE_CMD="update"
@@ -233,8 +261,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.20"; then
233261
PKG_EXT="apk"
234262
IS_OS_ALPINE=1
235263

236-
elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.19"; then
237-
DIST_TAG="alpine/v3.19"
264+
elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.20"; then
265+
DIST_TAG="alpine/v3.20"
238266
INSTALL_PKG_LIST="bash sudo alpine-sdk automake autoconf libtool groff util-linux-misc musl-locales ruby-dev procps"
239267
INSTALLER_BIN="apk"
240268
UPDATE_CMD="update"

‎buildutils/alpine_build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ fi
208208
#
209209

210210
if [ -z "${DEBEMAIL}" ]; then
211-
echo "[WARNING] DEBEMAIL environment is not set, so set default \"${USER}@$(hostname)\"" 1>&2
212-
DEBEMAIL="${USER}@$(hostname)"
211+
echo "[WARNING] DEBEMAIL environment is not set, so set default \"${USER}@$(hostname -f)\"" 1>&2
212+
DEBEMAIL="${USER}@$(hostname -f)"
213213
fi
214214

215215
if [ -z "${DEBFULLNAME}" ]; then

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ AC_CHECK_FILE([configure.custom],
9999
custom_git_org="yahoojapan"
100100
custom_git_repo="fullock"
101101
custom_git_endpoint="https://api.github.com/repos/"
102-
custom_dev_email="antpickax-support@mail.yahoo.co.jp"
102+
custom_dev_email="ml-antpickax-support@lycorp.co.jp"
103103
custom_dev_name="FULLOCK_DEVELOPER"
104104
]
105105
)

0 commit comments

Comments
 (0)