Skip to content

Commit

Permalink
Merge pull request #299 from laminas/1.25.x-merge-up-into-2.0.x_OMeknp7I
Browse files Browse the repository at this point in the history
Merge release 1.25.0 into 2.0.x
  • Loading branch information
boesing authored Apr 25, 2024
2 parents 4f5e67f + f25365c commit 87351e8
Show file tree
Hide file tree
Showing 7 changed files with 533 additions and 478 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-push-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ jobs:
echo "tags=[\"${MAJOR}\",\"${MINOR}\",\"${PATCH}\"]" >> $GITHUB_OUTPUT
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.CONTAINER_USERNAME }}
password: ${{ secrets.CONTAINER_PAT }}

- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
Expand Down
47 changes: 29 additions & 18 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix: ${{ steps.matrix.outputs.matrix }}
steps:
- name: Checkout sourcecode
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Gather integration test directory names
id: matrix
# This provides a dedicated "check" to asynchronously test all integration tests within the tests/ directory
Expand All @@ -34,16 +34,16 @@ jobs:
fail-fast: true
steps:
- name: Checkout sourcecode
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build container for CI pipeline
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
load: true
Expand All @@ -54,7 +54,7 @@ jobs:
cache-to: type=gha,mode=max

- name: Upload container artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: container
path: /tmp/container.tar
Expand All @@ -69,10 +69,10 @@ jobs:
projectName: ${{ fromJSON(needs.matrix.outputs.matrix) }}
steps:
- name: Checkout sourcecode
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download container artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: container
path: /tmp
Expand Down Expand Up @@ -116,27 +116,27 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: false

linting:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/setup-node@v3"
- uses: "actions/checkout@v4"
- uses: "actions/setup-node@v4"
with:
check-latest: true
node-version: 20
node-version: 21
- name: "Install node modules"
run: "npm ci"
- name: Run ESLint
Expand All @@ -145,12 +145,23 @@ jobs:
testing:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/setup-node@v3"
- uses: "actions/checkout@v4"
- uses: "actions/setup-node@v4"
with:
check-latest: true
node-version: 20
node-version: 21
- name: "Install node modules"
run: "npm ci"
- name: Run Jest
run: "npm run test"

package-lock-up-to-date:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v4"
- uses: "actions/setup-node@v4"
with:
check-latest: true
node-version: 21
- name: "Check package-lock.json is up2date"
run: "npx --yes package-lock-utd"
2 changes: 1 addition & 1 deletion .github/workflows/create-additional-action-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
needs: [tags]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Update tags
env:
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"

- name: "Release"
uses: "laminas/automatic-releases@v1"
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
FROM node:20.5.1-alpine as compiler
FROM node:21.7.3-alpine as compiler

RUN mkdir -p /usr/local/source
WORKDIR /usr/local/source
COPY package*.json ./
COPY tsconfig.json ./
COPY webpack.config.ts ./
RUN npm ci
RUN apk add --no-cache jq && npx semver -r $(jq -r '.engines.node' package.json) $(node -v) || (echo "ERROR: Container node version is not allowed by projects package.json engine range." && exit 1)
COPY ./src ./src
RUN npm run build


FROM node:20.5.1-alpine
FROM node:21.7.3-alpine
LABEL "repository"="http://github.com/laminas/laminas-ci-matrix-action"
LABEL "homepage"="http://github.com/laminas/laminas-ci-matrix-action"
LABEL "maintainer"="https://github.com/laminas/technical-steering-committee/"
Expand Down
Loading

0 comments on commit 87351e8

Please sign in to comment.