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

ci updates #7882

Merged
merged 1 commit into from
Dec 21, 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/syntax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.1', '8.2', '8.3', '8.4']
php: ['8.1', '8.2', '8.3', '8.4', '8.5']
name: PHP ${{ matrix.php }}
steps:
- uses: actions/checkout@v3
Expand Down
93 changes: 0 additions & 93 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,99 +291,6 @@ jobs:
build_test_common
if: ${{ success() || failure() }}

build_apache_83_112:
name: PHP 8.3 - Apache - MariaDB 11.2 (short term release)
runs-on: ubuntu-22.04
env:
DOCKER_DIR: apache_83_112
OPENEMR_DIR: /var/www/localhost/htdocs/openemr
CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
steps:
- uses: actions/checkout@v4

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.3'

- name: Report PHP Version
run: php -v

- name: Install npm package
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Main build
run: |
source ci/ciLibrary.source
composer_github_auth
main_build

- name: CCDA build
run: |
source ci/ciLibrary.source
ccda_build

- name: Dockers environment start
run: |
source ci/ciLibrary.source
dockers_env_start
sleep 60

- name: Install and configure
run: |
source ci/ciLibrary.source
install_configure

- name: Unit testing
run: |
source ci/ciLibrary.source
build_test_unit
if: ${{ success() || failure() }}

- name: E2e testing
run: |
source ci/ciLibrary.source
build_test_e2e
if: ${{ success() || failure() }}

- name: Api testing
run: |
source ci/ciLibrary.source
build_test_api
if: ${{ success() || failure() }}

- name: Fixtures testing
run: |
source ci/ciLibrary.source
build_test_fixtures
if: ${{ success() || failure() }}

- name: Services testing
run: |
source ci/ciLibrary.source
build_test_services
if: ${{ success() || failure() }}

- name: Validators testing
run: |
source ci/ciLibrary.source
build_test_validators
if: ${{ success() || failure() }}

- name: Controllers testing
run: |
source ci/ciLibrary.source
build_test_controllers
if: ${{ success() || failure() }}

- name: Common testing
run: |
source ci/ciLibrary.source
build_test_common
if: ${{ success() || failure() }}

build_apache_83_1011:
name: PHP 8.3 - Apache - MariaDB 10.11
runs-on: ubuntu-22.04
Expand Down
21 changes: 0 additions & 21 deletions ci/apache_83_112/docker-compose.yml

This file was deleted.

6 changes: 3 additions & 3 deletions docker/library/dockers/dev-php-fpm-8-4-redis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# php-fpm Dockerfile build for openemr development docker environment
# This docker is hosted here: https://hub.docker.com/r/openemr/dev-php-fpm/ <tag is 7.2>
#
FROM php:8.4-rc-fpm
FROM php:8.4-fpm

#
# TODO
Expand Down Expand Up @@ -47,8 +47,8 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
tokenizer \
xmlreader \
calendar \
intl
#redis
intl \
redis

# Copy over the php.ini conf
COPY php.ini /usr/local/etc/php/php.ini
Expand Down
2 changes: 1 addition & 1 deletion docker/library/dockers/dev-php-fpm-8-4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# php-fpm Dockerfile build for openemr development docker environment
# This docker is hosted here: https://hub.docker.com/r/openemr/dev-php-fpm/ <tag is 7.2>
#
FROM php:8.4-rc-fpm
FROM php:8.4-fpm

# Update
RUN apt-get update
Expand Down