Skip to content

Commit

Permalink
🔀 Merge pull request #32 from likesistemas/feature/NFE-180_v2
Browse files Browse the repository at this point in the history 
✨ [NFE-180] Adicionando suporte ao PHP 8.2 e 8.3
  • Loading branch information
@ricardoapaes
ricardoapaes committed Nov 14, 2023
2 parents aca6334 + 282cac2 commit 100a8e5
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 29 deletions.
65 changes: 52 additions & 13 deletions .github/workflows/docker-publish-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
test:
strategy:
matrix:
PHP: [73, 74, 80, 81]
PHP: [73, 74, 80, 81, 82, 83]

runs-on: ubuntu-latest

Expand All @@ -30,8 +30,11 @@ jobs:
echo "IMAGE=sistema-core-dev" >> .env
echo "VERSAO=${PHP_VERSION}-dev" >> .env
echo "PASTA_WWW=www${PHP_VERSION}" >> .env
ln -s www80 www81
ln -s www80 www82
ln -s www80 www83
- name: Run tests dev
- name: Up environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
Expand All @@ -40,37 +43,57 @@ jobs:
--file docker-compose-${PHP_VERSION}.yml \
--file docker-compose.dev.yml \
up --build -d
- name: Wait environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
echo $(docker run -t --network lemp jwilder/dockerize \
-wait http://core_nginx/ \
-timeout 60s)
- name: Logs environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker ps -a
docker logs app
- name: Test -> Http Request
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
CONTENT=$(curl -s "http://127.0.0.1/");
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA HTTP: ${CONTENT}";
echo "CHAMADA APP: ${APP_CONTENT}";
if [ "${CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada HTTP retornou errado: ${CONTENT}"
exit 1;
fi
- name: Test -> App Request
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA APP: ${APP_CONTENT}";
if [ "${APP_CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada APP retornou errado: ${APP_CONTENT}"
exit 1;
fi
- name: Down environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker-compose \
--file docker-compose.yml \
--file docker-compose-${PHP_VERSION}.yml \
--file docker-compose.dev.yml \
down -v
- name: Run tests prod
- name: Production -> Up environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
Expand All @@ -80,25 +103,41 @@ jobs:
--file docker-compose.dev.yml \
--file docker-compose.prod.yml \
up --build -d
- name: Production -> Wait environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
echo $(docker run -t --network lemp jwilder/dockerize \
-wait http://core_nginx/ \
-timeout 60s)
- name: Production -> Logs environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker ps -a
docker logs app
- name: Production -> Http test
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
CONTENT=$(curl -s "http://127.0.0.1/");
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA HTTP: ${CONTENT}";
echo "CHAMADA APP: ${APP_CONTENT}";
if [ "${CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada HTTP retornou errado: ${CONTENT}"
exit 1;
fi
- name: Production -> App test
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA APP: ${APP_CONTENT}";
if [ "${APP_CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada APP retornou errado: ${APP_CONTENT}"
exit 1;
Expand All @@ -109,7 +148,7 @@ jobs:

strategy:
matrix:
PHP: [73, 74, 80, 81]
PHP: [73, 74, 80, 81, 82, 83]

runs-on: ubuntu-latest
if: github.event_name == 'push'
Expand Down
71 changes: 55 additions & 16 deletions .github/workflows/docker-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
test:
strategy:
matrix:
PHP: [73, 74, 80, 81]
PHP: [73, 74, 80, 81, 82, 83]

runs-on: ubuntu-latest

Expand All @@ -30,43 +30,66 @@ jobs:
echo "PHP_VERSION=${PHP_VERSION}"
echo "VERSAO=${PHP_VERSION}-dev" >> .env
echo "PASTA_WWW=www${PHP_VERSION}" >> .env
ln -s www80 www81
ln -s www80 www82
ln -s www80 www83
- name: Run tests dev
- name: Up environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker-compose -f docker-compose.yml \
-f docker-compose-${PHP_VERSION}.yml \
up --build -d
- name: Wait environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
echo $(docker run -t --network lemp jwilder/dockerize \
-wait http://core_nginx/ \
-timeout 60s)
- name: Logs environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker ps -a
docker logs app
- name: Test -> Http request
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
CONTENT=$(curl -s "http://127.0.0.1/");
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA HTTP: ${CONTENT}";
echo "CHAMADA APP: ${APP_CONTENT}";
echo "CHAMADA HTTP: ${CONTENT}";
if [ "${CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada HTTP retornou errado: ${CONTENT}"
exit 1;
fi
- name: Test -> App request
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA APP: ${APP_CONTENT}";
if [ "${APP_CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada APP retornou errado: ${APP_CONTENT}"
exit 1;
fi
- name: Down environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker-compose -f docker-compose.yml \
-f docker-compose-${PHP_VERSION}.yml \
down -v
- name: Run tests app
- name: Test -> App tests
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
Expand All @@ -82,7 +105,7 @@ jobs:
exit 1;
fi
- name: Run tests config disabled
- name: Test -> App tests config disabled
if: matrix.PHP == '80'
env:
PHP_VERSION: ${{ matrix.PHP }}
Expand Down Expand Up @@ -113,7 +136,7 @@ jobs:
-f docker-compose-config-disabled.yml \
down -v
- name: Run tests prod
- name: Production -> Up environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
Expand All @@ -122,24 +145,40 @@ jobs:
-f docker-compose.prod.yml \
up --build -d
- name: Production -> Wait environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
echo $(docker run -t --network lemp jwilder/dockerize \
-wait http://core_nginx/ \
-timeout 60s)
- name: Production -> Wait environment
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
docker ps -a
docker logs app
CONTENT=$(curl -s "http://127.0.0.1/");
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA HTTP: ${CONTENT}";
echo "CHAMADA APP: ${APP_CONTENT}";
- name: Test -> Http test
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
CONTENT=$(curl -s "http://127.0.0.1/");
echo "CHAMADA HTTP: ${CONTENT}";
if [ "${CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada HTTP retornou errado: ${CONTENT}"
exit 1;
fi
- name: Test -> App test
env:
PHP_VERSION: ${{ matrix.PHP }}
run: |
APP_CONTENT=$(docker exec app app echo);
echo "CHAMADA APP: ${APP_CONTENT}";
if [ "${APP_CONTENT}" != "core|${PHP_VERSION}" ]; then
echo "Chamada APP retornou errado: ${APP_CONTENT}"
exit 1;
Expand All @@ -150,7 +189,7 @@ jobs:

strategy:
matrix:
PHP: [73, 74, 80, 81]
PHP: [73, 74, 80, 81, 82, 83]

runs-on: ubuntu-latest
if: github.event_name == 'push'
Expand Down
20 changes: 20 additions & 0 deletions docker-compose-83.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '3.5'

services:

app:
command: app create && add-new-config php version 8.3
environment:
- DB_HOST_SLAVE=mysql_slave
- MEMCACHE_HOST=memcache
- MEMCACHE_PORT=11212
- EMAIL_USUARIO=core@likesistemas.com.br
- EMAIL_SENHA=123456
- EMAIL_DE=contato@likesistemas.com.br
- EMAIL_NOME=Ricardo
- AWS_KEY=like123456
- AWS_SECRET=78910

nginx:
environment:
- INDEX_FILE=index.php

0 comments on commit 100a8e5

Please sign in to comment.