ci updates (#7882)

openemr · Dec 21, 2024 · abbc3ce · abbc3ce
1 parent fc24e07
commit abbc3ce
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 119 deletions.
diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
@@ -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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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

diff --git a/ci/apache_83_112/docker-compose.yml b/ci/apache_83_112/docker-compose.yml
diff --git a/docker/library/dockers/dev-php-fpm-8-4-redis/Dockerfile b/docker/library/dockers/dev-php-fpm-8-4-redis/Dockerfile
@@ -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
@@ -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

diff --git a/docker/library/dockers/dev-php-fpm-8-4/Dockerfile b/docker/library/dockers/dev-php-fpm-8-4/Dockerfile
@@ -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