Merge branch 1.38.x into 2.0.x

Author: Xerkus

Dockerfile

@@ -1,16 +1,27 @@
+ARG NODE_MAJOR=20
+
 # Aliasing base images, so we can change just this, when needing to upgrade or pull base layers
 FROM ubuntu:22.04 AS base-distro
-FROM composer:2.4.4 AS composer
-
+FROM composer:2.6.6 AS composer
 
 FROM base-distro AS install-markdownlint
+ARG NODE_MAJOR
+ENV NODE_MAJOR=$NODE_MAJOR
 
 # Install system dependencies first - these don't change much
-RUN export DEBIAN_FRONTEND=noninteractive \
-    && (curl -ssL https://deb.nodesource.com/setup_20.x | bash -) \
+RUN set -eux; \
+    export DEBIAN_FRONTEND=noninteractive \
+    && apt update \
+    && apt install -y --no-install-recommends \
+      ca-certificates \
+      curl \
+      gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && apt update \
     && apt install -y --no-install-recommends \
-        npm \
+        nodejs \
     && apt clean
 
 COPY setup/markdownlint/package.json \
@@ -30,32 +41,39 @@ RUN cd /markdownlint \
 
 
 FROM base-distro
-
+ARG NODE_MAJOR
 LABEL "repository"="http://github.com/laminas/laminas-continuous-integration-action"
 LABEL "homepage"="http://github.com/laminas/laminas-continuous-integration-action"
 LABEL "maintainer"="https://github.com/laminas/technical-steering-committee/"
 
 ENV COMPOSER_HOME=/usr/local/share/composer \
     DEBIAN_FRONTEND=noninteractive \
-    ACCEPT_EULA=Y
+    ACCEPT_EULA=Y \
+    NODE_MAJOR=$NODE_MAJOR
 
 # This may look a bit long, but it's just a big `apt install` section, followed by a cleanup,
 # so that we get a single compact layer, with not too many layer overwrites.
-RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2) \
+RUN set -eux; \
+    export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2) \
     && apt update \
     && apt upgrade -y \
     && apt install -y --no-install-recommends \
       curl \
       gpg-agent \
       software-properties-common \
+      ca-certificates \
+      gnupg \
     && (curl -sSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/microsoft.gpg) \
     && add-apt-repository -y ppa:ondrej/php \
     && curl -sSL https://packages.microsoft.com/config/ubuntu/$OS_VERSION/prod.list | tee /etc/apt/sources.list.d/microsoft.list \
-    && (curl -ssL https://deb.nodesource.com/setup_20.x | bash -) \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && apt update \
     && apt install -y --no-install-recommends \
         # Base dependencies
         git \
+        nodejs \
         jq \
         libxml2-utils \
         libzip-dev \
@@ -71,6 +89,7 @@ RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2)
         php-pear \
         \
         php8.0-cli \
+        php8.0-bcmath \
         php8.0-bz2 \
         php8.0-curl \
         php8.0-dev \
@@ -86,6 +105,7 @@ RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2)
         php8.0-zip \
         \
         php8.1-cli \
+        php8.1-bcmath \
         php8.1-bz2 \
         php8.1-curl \
         php8.1-dev \
@@ -101,6 +121,7 @@ RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2)
         php8.1-zip \
         \
         php8.2-cli \
+        php8.2-bcmath \
         php8.2-bz2 \
         php8.2-curl \
         php8.2-dev \
@@ -116,6 +137,7 @@ RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2)
         php8.2-zip \
         \
         php8.3-cli \
+        php8.3-bcmath \
         php8.3-bz2 \
         php8.3-curl \
         php8.3-dev \
@@ -176,15 +198,14 @@ COPY composer.json \
     /tools/
 
 # Set default PHP version based on the `composer.json` `config.platform.php` setting
-RUN export DEFAULT_PHP_VERSION=$(jq -r '.config.platform.php | sub("(?<minor>[0-9.]).99$"; "\(.minor)")' /tools/composer.json) \
+RUN set -eux; \
+    export DEFAULT_PHP_VERSION=$(jq -r '.config.platform.php | sub("(?<minor>[0-9.]).99$"; "\(.minor)")' /tools/composer.json) \
     && update-alternatives --set php /usr/bin/php$DEFAULT_PHP_VERSION \
     && update-alternatives --set phpize /usr/bin/phpize$DEFAULT_PHP_VERSION \
     && update-alternatives --set php-config /usr/bin/php-config$DEFAULT_PHP_VERSION \
     && echo "DEFAULT_PHP_VERSION=${DEFAULT_PHP_VERSION}" >> /etc/environment
 
 RUN cd /tools \
-    # Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
-    && apt install -y php-bcmath \
     && composer install \
         --classmap-authoritative \
     # Cleanup composer files from external tools folder

README.md

@@ -59,7 +59,16 @@ Generally speaking, you will use this in combination with the [laminas/laminas-c
 
 ## Usage
 
+Create `.github/workflows/continuous-integration.yml` file with following content:
+
 ```yaml
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+
 jobs:
   matrix:
     name: Generate job matrix
@@ -70,7 +79,6 @@ jobs:
       - name: Gather CI configuration
         id: matrix
         uses: laminas/laminas-ci-matrix-action@v1
-
   qa:
     name: QA Checks
     needs: [matrix]
@@ -87,6 +95,27 @@ jobs:
           job: ${{ matrix.job }}
 ```
 
+The same can be achieved with our reusable workflow:
+
+```yaml
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+
+jobs:
+  ci:
+    uses: laminas/workflow-continuous-integration/.github/workflows/[email protected]
+```
+
+> ### Duplicate CI runs
+>
+> When pull requests are opened from branches in the same repository, the CI pipeline could run twice for the same commit: once when pushed to a branch and once when the PR is opened.
+> Workflow triggers can be adjusted to only run for specific branches or to skip branches using simple glob patterns.
+> See the GitHub documentation for [Events that trigger workflows](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-workflow-only-when-a-push-to-specific-branches-occurs) for more info.
+
 > ### actions/checkout not required
 >
 > The action will perform a checkout of the repository at the requested reference as part of its work, and therefore does not require the actions/checkout action as a preceding step.
@@ -219,7 +248,7 @@ The tricks to remember are:
 As an example, if you wanted to run the CS checks under PHP 8.2 using locked dependencies, you could do something like the following:
 
 ```bash
-$ docker run -v $(realpath .):/github/workspace -w=/github/workspace laminas-check-runner:latest '{"php":"8.2","dependencies":"locked","extensions":[],"ini":["memory_limit=-1"],"command":"./vendor/bin/phpcs"}'
+$ docker run -v $(realpath .):/github/workspace -w=/github/workspace ghcr.io/laminas/laminas-continuous-integration:1  '{"php":"8.2","dependencies":"locked","extensions":[],"ini":["memory_limit=-1"],"command":"./vendor/bin/phpcs"}'
 ```
 
 The trick to remember: the job JSON should generally be in single quotes, to allow the `"` characters used to delimit properties and strings in the JSON to not cause interpolation issues.