diff --git a/.github/workflows/build-and-push-containers.yml b/.github/workflows/build-and-push-containers.yml index 3d3bba33..937bf94b 100644 --- a/.github/workflows/build-and-push-containers.yml +++ b/.github/workflows/build-and-push-containers.yml @@ -35,7 +35,7 @@ jobs: password: ${{ secrets.CONTAINER_PAT }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d39ac3ce..c5bc7d1c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -43,7 +43,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build container for CI pipeline - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . load: true @@ -125,7 +125,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: push: false diff --git a/package-lock.json b/package-lock.json index d5e7d9c2..75bfd65f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "source-map-loader": "^5.0.0", "ts-jest": "^29.0.3", "ts-node": "^10.9.1", - "typescript": "~5.4.0", + "typescript": "~5.5.0", "webpack": "^5.74.0", "webpack-cli": "^5.0.0" }, @@ -7550,10 +7550,11 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 0bac52b3..baaca8f8 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "source-map-loader": "^5.0.0", "ts-jest": "^29.0.3", "ts-node": "^10.9.1", - "typescript": "~5.4.0", + "typescript": "~5.5.0", "webpack": "^5.74.0", "webpack-cli": "^5.0.0" } diff --git a/src/config/app.spec.ts b/src/config/app.spec.ts index 80b4c718..1ff13b5c 100644 --- a/src/config/app.spec.ts +++ b/src/config/app.spec.ts @@ -18,9 +18,9 @@ describe('config/app', () => { ${'8.1'} | ${[ '8.1' ]} ${'8.1.0'} | ${[ '8.1' ]} ${'8.1.12'} | ${[ '8.1' ]} - ${'^8.1'} | ${[ '8.1', '8.2', '8.3' ]} - ${'^8.1.0'} | ${[ '8.1', '8.2', '8.3' ]} - ${'^8.1.12'} | ${[ '8.1', '8.2', '8.3' ]} + ${'^8.1'} | ${[ '8.1', '8.2', '8.3', '8.4' ]} + ${'^8.1.0'} | ${[ '8.1', '8.2', '8.3', '8.4' ]} + ${'^8.1.12'} | ${[ '8.1', '8.2', '8.3', '8.4' ]} ${'~8.1'} | ${[ '8.1' ]} ${'~8.1.0'} | ${[ '8.1' ]} ${'~8.1.12'} | ${[ '8.1' ]} @@ -48,7 +48,7 @@ describe('config/app', () => { codeChecks : true, docLinting : true, versions : [ '8.1' ], - stablePhpVersion : '8.0', + stablePhpVersion : '8.1', minimumPhpVersion : '8.1', latestPhpVersion : '8.1', lockedDependenciesExists : false, diff --git a/src/config/php.ts b/src/config/php.ts index 04882e41..4a77577e 100644 --- a/src/config/php.ts +++ b/src/config/php.ts @@ -8,8 +8,9 @@ export const PHP_80 = '8.0'; export const PHP_81 = '8.1'; export const PHP_82 = '8.2'; export const PHP_83 = '8.3'; +export const PHP_84 = '8.4'; -export const CURRENT_STABLE = PHP_80; +export const CURRENT_STABLE = PHP_81; export const CONTAINER_DEFAULT_PHP_VERSION = '@default'; /** @@ -27,6 +28,7 @@ export const INSTALLABLE_VERSIONS = [ PHP_81, PHP_82, PHP_83, + PHP_84, CONTAINER_DEFAULT_PHP_VERSION, ] as const;