Skip to content

Commit 770eb43

Browse files
authored
Merge branch 'master' into eol_php81_rhel9_may2025
2 parents 32af5ef + 9eca57f commit 770eb43

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

.github/workflows/build-and-push.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- dockerfile: "8.0/Dockerfile.fedora"
18-
docker_context: "8.0"
19-
registry_namespace: "fedora"
20-
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
21-
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
22-
tag: "8.0"
23-
image_name: "php-80"
24-
25-
- dockerfile: "8.1/Dockerfile.fedora"
26-
docker_context: "8.1"
27-
registry_namespace: "fedora"
28-
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
29-
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
30-
tag: "8.1"
31-
image_name: "php-81"
32-
3317
- dockerfile: "8.2/Dockerfile.fedora"
3418
docker_context: "8.2"
3519
registry_namespace: "fedora"

.github/workflows/openshift-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
version: [ "7.4", "8.0" , "8.2", "8.3" ]
30+
version: [ "7.4", "8.0", "8.2", "8.3" ]
3131
os_test: [ "rhel8", "rhel9", "rhel10" ]
3232
test_case: [ "openshift-4" ]
3333

0 commit comments

Comments
 (0)