Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 1.25.0 into 2.0.x #299

Merged
merged 36 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
060daa8
Lock file maintenance
renovate[bot] Sep 3, 2023
13b11c2
Update actions/checkout action to v4
renovate[bot] Sep 4, 2023
f317896
Merge pull request #269 from laminas/renovate/lock-file-maintenance
boesing Sep 4, 2023
a9a102c
Merge pull request #268 from laminas/renovate/actions-checkout-4.x
boesing Sep 4, 2023
5af7cf5
Lock file maintenance
renovate[bot] Sep 4, 2023
9e5ae09
Update node Docker tag to v20.6.0
renovate[bot] Sep 6, 2023
0df91e1
Lock file maintenance
renovate[bot] Sep 7, 2023
2156537
Lock file maintenance
renovate[bot] Sep 8, 2023
5ec6861
Lock file maintenance
renovate[bot] Sep 10, 2023
825f488
Update node Docker tag to v20.6.1
renovate[bot] Sep 11, 2023
35dab19
Lock file maintenance
renovate[bot] Sep 18, 2023
85e7749
Update docker/build-push-action action to v5
renovate[bot] Sep 19, 2023
ebed040
Update npm to v10
renovate[bot] Apr 23, 2024
ded5fb6
Merge pull request #265 from laminas/renovate/npm-10.x
boesing Apr 23, 2024
30a5cb3
Merge pull request #275 from laminas/renovate/docker-build-push-actio…
boesing Apr 23, 2024
a8b9ff4
Update all non-major dependencies
renovate[bot] Apr 23, 2024
94f1a1a
Update actions/setup-node action to v4
renovate[bot] Apr 23, 2024
c574f15
Update docker/login-action action to v3
renovate[bot] Apr 23, 2024
6d97257
Update docker/setup-buildx-action action to v3
renovate[bot] Apr 23, 2024
f6afabc
Update docker/setup-qemu-action action to v3
renovate[bot] Apr 23, 2024
441aeb7
Merge pull request #276 from laminas/renovate/docker-login-action-3.x
boesing Apr 23, 2024
5df02db
Merge pull request #277 from laminas/renovate/docker-setup-buildx-act…
boesing Apr 23, 2024
49f1ea5
Merge pull request #278 from laminas/renovate/docker-setup-qemu-actio…
boesing Apr 23, 2024
15caf36
Merge pull request #281 from laminas/renovate/all-minor-patch
boesing Apr 23, 2024
c8e15b4
Merge pull request #291 from laminas/renovate/actions-setup-node-4.x
boesing Apr 23, 2024
80d09e9
Update node Docker tag to v21
renovate[bot] Apr 23, 2024
f45fba4
Merge pull request #285 from laminas/renovate/node-21.x
boesing Apr 23, 2024
0fdc8f1
Update actions/download-artifact action to v4
renovate[bot] Apr 23, 2024
6ca5da6
Update actions/upload-artifact action to v4
boesing Apr 23, 2024
b55efa6
Merge pull request #290 from laminas/renovate/actions-download-artifa…
boesing Apr 23, 2024
e783271
Update dependency source-map-loader to v5
renovate[bot] Apr 24, 2024
bf9f170
Merge pull request #290 from laminas/renovate/actions-download-artifa…
boesing Apr 23, 2024
7961bb3
qa: replace `Dockerfile` `node` check with a dedicated job `package-l…
boesing Apr 24, 2024
7b1bb2a
Merge pull request #297 from laminas/renovate/source-map-loader-5.x
boesing Apr 24, 2024
ed19123
qa: ensure that the container node version is allowed by the projects…
boesing Apr 24, 2024
f25365c
Merge pull request #298 from boesing/qa/synchronize-package-json-with…
boesing Apr 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading