From 9f258eaaf6bb5f5a5d1f9b44a72b50651a7f1768 Mon Sep 17 00:00:00 2001 From: Atsushi Matsuo Date: Sun, 28 Jul 2024 10:26:20 +0900 Subject: [PATCH 1/4] Delete dockerfiles and an old workflow file for GitHub Actions to prepare for testing on multiple platforms --- .github/workflows/php-7.2.dockerfile | 25 --------------------- .github/workflows/php-7.3.dockerfile | 25 --------------------- .github/workflows/php-7.4.dockerfile | 25 --------------------- .github/workflows/php-8.0.dockerfile | 25 --------------------- .github/workflows/php-8.1.dockerfile | 25 --------------------- .github/workflows/php-8.2.dockerfile | 25 --------------------- .github/workflows/php-8.3.dockerfile | 25 --------------------- .github/workflows/php.yml | 33 ---------------------------- 8 files changed, 208 deletions(-) delete mode 100644 .github/workflows/php-7.2.dockerfile delete mode 100644 .github/workflows/php-7.3.dockerfile delete mode 100644 .github/workflows/php-7.4.dockerfile delete mode 100644 .github/workflows/php-8.0.dockerfile delete mode 100644 .github/workflows/php-8.1.dockerfile delete mode 100644 .github/workflows/php-8.2.dockerfile delete mode 100644 .github/workflows/php-8.3.dockerfile delete mode 100644 .github/workflows/php.yml diff --git a/.github/workflows/php-7.2.dockerfile b/.github/workflows/php-7.2.dockerfile deleted file mode 100644 index 9736aed..0000000 --- a/.github/workflows/php-7.2.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM php:7.2-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install mbstring bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php-7.3.dockerfile b/.github/workflows/php-7.3.dockerfile deleted file mode 100644 index 67897f2..0000000 --- a/.github/workflows/php-7.3.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM php:7.3-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install mbstring bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php-7.4.dockerfile b/.github/workflows/php-7.4.dockerfile deleted file mode 100644 index 2f05a28..0000000 --- a/.github/workflows/php-7.4.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM php:7.4-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php-8.0.dockerfile b/.github/workflows/php-8.0.dockerfile deleted file mode 100644 index 9cdfd73..0000000 --- a/.github/workflows/php-8.0.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM --platform=linux/amd64 php:8.0-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd ldap -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php-8.1.dockerfile b/.github/workflows/php-8.1.dockerfile deleted file mode 100644 index 9c4ddec..0000000 --- a/.github/workflows/php-8.1.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM --platform=linux/amd64 php:8.1-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd ldap -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php-8.2.dockerfile b/.github/workflows/php-8.2.dockerfile deleted file mode 100644 index 785907c..0000000 --- a/.github/workflows/php-8.2.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM --platform=linux/amd64 php:8.2-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd ldap -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php-8.3.dockerfile b/.github/workflows/php-8.3.dockerfile deleted file mode 100644 index e44f1fe..0000000 --- a/.github/workflows/php-8.3.dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM --platform=linux/amd64 php:8.3-apache -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - iputils-ping \ - libldap2-dev \ - libpng-dev \ - libpq-dev \ - libsqlite3-dev \ - libzip-dev \ - mariadb-client \ - postgresql-client \ - sqlite3 \ - sudo \ - unzip \ - vim \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install bcmath zip pdo pdo_mysql pdo_pgsql pdo_sqlite exif gd ldap -COPY composer.json /composer.json -COPY composer.lock /composer.lock -COPY src /src -COPY test /test -RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer -RUN cd / && composer update -#RUN composer test diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml deleted file mode 100644 index bf99b0b..0000000 --- a/.github/workflows/php.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Test - -on: - push: - branches: - - "*" - pull_request: - branches: [ 'master', 'main' ] - workflow_dispatch: - schedule: - - cron: '0 9 15 * *' - -jobs: - test: - name: Test - runs-on: ubuntu-latest - strategy: - matrix: - php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ] - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - name: Run docker-compose - shell: bash - run: | - cp .github/workflows/php-${{ matrix.php }}.dockerfile Dockerfile - docker-compose up -d - sleep 30 - - - name: Run testing - shell: bash - run: | - sleep 30 - docker-compose exec -T web sh -c "cd / && php -v && composer test" From 7a5911ccd03c08901af8c88b6b96a2b6d136fc8a Mon Sep 17 00:00:00 2001 From: Atsushi Matsuo Date: Sun, 28 Jul 2024 10:34:05 +0900 Subject: [PATCH 2/4] Update a workflow file for GitHub Actions to test on multiple platforms --- .github/workflows/php-multiplatform.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php-multiplatform.yml b/.github/workflows/php-multiplatform.yml index cc0cd39..a0f410b 100644 --- a/.github/workflows/php-multiplatform.yml +++ b/.github/workflows/php-multiplatform.yml @@ -1,4 +1,4 @@ -name: Test on multiple platforms +name: Test on: push: @@ -12,7 +12,7 @@ on: jobs: test: - name: Test on multiple platforms + name: Test runs-on: ${{ matrix.os }} env: PHP_EXTENSIONS: mbstring, json, bcmath, zip, pdo, pdo_mysql, pdo_pgsql, pdo_sqlite, exif, gd, ldap, fileinfo @@ -20,7 +20,7 @@ jobs: matrix: # https://github.com/shivammathur/setup-php?tab=readme-ov-file#cloud-osplatform-support os: [ 'ubuntu-24.04', 'windows-2022', 'macos-13' ] - php-version: [ '8.3' ] + php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] steps: - name: Checkout uses: actions/checkout@v4 @@ -33,7 +33,9 @@ jobs: extensions: ${{ env.PHP_EXTENSIONS }} - name: Prepare environment - run: composer install + run: composer update - name: Run testing - run: composer test + run: | + php -v + composer test From 9f1582deec93e34f31be2b0d3c3dc57c76edcd1c Mon Sep 17 00:00:00 2001 From: Atsushi Matsuo Date: Sun, 28 Jul 2024 10:34:44 +0900 Subject: [PATCH 3/4] Rename php-multiplatform.yml to php.yml --- .github/workflows/{php-multiplatform.yml => php.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{php-multiplatform.yml => php.yml} (100%) diff --git a/.github/workflows/php-multiplatform.yml b/.github/workflows/php.yml similarity index 100% rename from .github/workflows/php-multiplatform.yml rename to .github/workflows/php.yml From 87ced376ef6b76fe9893e1f3cfa84b06844760f7 Mon Sep 17 00:00:00 2001 From: Atsushi Matsuo Date: Sun, 28 Jul 2024 10:38:31 +0900 Subject: [PATCH 4/4] Update php.yml for CI --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index a0f410b..5005b51 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: # https://github.com/shivammathur/setup-php?tab=readme-ov-file#cloud-osplatform-support - os: [ 'ubuntu-24.04', 'windows-2022', 'macos-13' ] + os: [ 'ubuntu-22.04', 'windows-2022', 'macos-14' ] php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] steps: - name: Checkout