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.27.0 into 2.0.x #307

Merged
merged 5 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
8 changes: 4 additions & 4 deletions src/config/app.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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' ]}
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion src/config/php.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand All @@ -27,6 +28,7 @@ export const INSTALLABLE_VERSIONS = [
PHP_81,
PHP_82,
PHP_83,
PHP_84,
CONTAINER_DEFAULT_PHP_VERSION,
] as const;

Expand Down
Loading