Skip to content

Commit

Permalink
Merge pull request #9 from ggtakec/update_etc
Browse files Browse the repository at this point in the history
Updated github actions tools and Changed support OS/PHP
  • Loading branch information
Takeshi Nakatani authored Mar 15, 2024
2 parents 2b8e046 + e2610a3 commit a43d49e
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 12 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ jobs:
- rockylinux:9
- rockylinux:8
- centos:centos7
- fedora:39
- fedora:38
- fedora:37
- alpine:3.19
- alpine:3.18

php:
Expand All @@ -90,11 +91,17 @@ jobs:
NO_INTERACTION: 1

steps:
#
# Checks-out your repository under $GITHUB_WORKSPACE, so your
# job can access it
#
- name: Checkout sources
# [NOTE]
# actions/checkout@v3 uses nodejs v16 and will be deprecated.
# However, @v4 does not work on centos7 depending on the glibc version,
# so we will continue to use @v3.
#
- name: Checkout source code(other than centos7)
if: matrix.container != 'centos:centos7'
uses: actions/checkout@v4

- name: Checkout source code(only centos7)
if: matrix.container == 'centos:centos7'
uses: actions/checkout@v3

#
Expand Down
40 changes: 34 additions & 6 deletions .github/workflows/phpexttypevars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ elif [ "${CI_OSTYPE}" = "centos:7" ] || [ "${CI_OSTYPE}" = "centos:centos7" ]; t

IS_OS_CENTOS=1

elif [ "${CI_OSTYPE}" = "fedora:38" ]; then
DIST_TAG="fedora/38"
elif [ "${CI_OSTYPE}" = "fedora:39" ]; then
DIST_TAG="fedora/39"
PKG_EXT="rpm"
PKG_OUTPUT_DIR="packages"

Expand All @@ -390,7 +390,7 @@ elif [ "${CI_OSTYPE}" = "fedora:38" ]; then
INSTALL_PKG_LIST="git make diffutils pkgconfig patch yum-utils rpmdevtools redhat-rpm-config rpm-build rpm-devel rpmlint scl-utils-build ruby-devel rubygems procps python3 chmpx-devel"

INSTALL_PHP_PRE_ADD_REPO=""
INSTALL_PHP_REPO="https://rpms.remirepo.net/fedora/remi-release-38.rpm"
INSTALL_PHP_REPO="https://rpms.remirepo.net/fedora/remi-release-39.rpm"
INSTALL_PHP_PKG_LIST="php${PHPVER_NOPERIOD}-php-devel php${PHPVER_NOPERIOD}-scldevel php${PHPVER_NOPERIOD}-build"
INSTALL_PHP_OPT=""
INSTALL_PHP_POST_CONFIG=""
Expand All @@ -399,8 +399,8 @@ elif [ "${CI_OSTYPE}" = "fedora:38" ]; then

IS_OS_FEDORA=1

elif [ "${CI_OSTYPE}" = "fedora:37" ]; then
DIST_TAG="fedora/37"
elif [ "${CI_OSTYPE}" = "fedora:38" ]; then
DIST_TAG="fedora/38"
PKG_EXT="rpm"
PKG_OUTPUT_DIR="packages"

Expand All @@ -414,7 +414,7 @@ elif [ "${CI_OSTYPE}" = "fedora:37" ]; then
INSTALL_PKG_LIST="git make diffutils pkgconfig patch yum-utils rpmdevtools redhat-rpm-config rpm-build rpm-devel rpmlint scl-utils-build ruby-devel rubygems procps python3 chmpx-devel"

INSTALL_PHP_PRE_ADD_REPO=""
INSTALL_PHP_REPO="https://rpms.remirepo.net/fedora/remi-release-37.rpm"
INSTALL_PHP_REPO="https://rpms.remirepo.net/fedora/remi-release-38.rpm"
INSTALL_PHP_PKG_LIST="php${PHPVER_NOPERIOD}-php-devel php${PHPVER_NOPERIOD}-scldevel php${PHPVER_NOPERIOD}-build"
INSTALL_PHP_OPT=""
INSTALL_PHP_POST_CONFIG=""
Expand All @@ -423,6 +423,34 @@ elif [ "${CI_OSTYPE}" = "fedora:37" ]; then

IS_OS_FEDORA=1

elif [ "${CI_OSTYPE}" = "alpine:3.19" ]; then
DIST_TAG="alpine/v3.19"
PKG_EXT="apk"
PKG_OUTPUT_DIR="packages"

INSTALLER_BIN="apk"
UPDATE_CMD="update"
UPDATE_CMD_ARG="--no-progress"
INSTALL_CMD="add"
INSTALL_CMD_ARG="--no-progress --no-cache"
INSTALL_AUTO_ARG=""
INSTALL_QUIET_ARG="-q"
INSTALL_PKG_LIST="bash sudo alpine-sdk util-linux-misc musl-locales ruby-dev procps chmpx-dev"

INSTALL_PHP_PRE_ADD_REPO=""
INSTALL_PHP_REPO=""
INSTALL_PHP_PKG_LIST="php${PHPVER_NOPERIOD} php${PHPVER_NOPERIOD}-dev php${PHPVER_NOPERIOD}-tokenizer"
INSTALL_PHP_OPT=""
INSTALL_PHP_POST_CONFIG=""
INSTALL_PHP_POST_BIN=""
SWITCH_PHP_COMMAND=""

IS_OS_ALPINE=1

if [ "${PHPVER_NOPERIOD}" != "82" ]; then
NOT_PROVIDED_PHPVER=1
fi

elif [ "${CI_OSTYPE}" = "alpine:3.18" ]; then
DIST_TAG="alpine/v3.18"
PKG_EXT="apk"
Expand Down

0 comments on commit a43d49e

Please sign in to comment.