ci: add mariadb 10.7 and updated to currently used alpine 3.15 dockers (

openemr#4936) * ci: add mariadb 10.7 and updated to currently used alpine 3.15 dockers * fix to try to speed up ci a bit
DiscoverAndChange · Feb 21, 2022 · 0cba4bb · 0cba4bb
1 parent 9dc93c8
commit 0cba4bb
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -100,11 +100,11 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
- build_apache_80_105:
- name: PHP 8.0 - Apache - MariaDB 10.5
+ build_apache_80_107:
+ name: PHP 8.0 - Apache - MariaDB 10.7 (short term release)
  runs-on: ubuntu-20.04
  env:
- DOCKER_DIR: apache_80_105
+ DOCKER_DIR: apache_80_107
  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:
@@ -284,6 +284,98 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
+ build_apache_80_105:
+ name: PHP 8.0 - Apache - MariaDB 10.5
+ runs-on: ubuntu-20.04
+ env:
+ DOCKER_DIR: apache_80_105
+ 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@v2
+
+ - name: Install PHP
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: '8.0'
+
+ - name: Report PHP Version
+ run: php -v
+
+ - name: Install npm package
+ uses: actions/setup-node@v1
+ with:
+ node-version: '16'
+
+ - name: Dockers environment start
+ run: |
+ source ci/ciLibrary.source
+ dockers_env_start
+
+ - name: Main build
+ run: |
+ source ci/ciLibrary.source
+ composer_github_auth
+ main_build
+
+ - name: CCDA build
+ run: |
+ source ci/ciLibrary.source
+ ccda_build
+
+ - 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_80_104:
  name: PHP 8.0 - Apache - MariaDB 10.4
  runs-on: ubuntu-20.04

diff --git a/ci/apache_74_106/docker-compose.yml b/ci/apache_74_106/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14
+ image: openemr/openemr:flex-3.15
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_102/docker-compose.yml b/ci/apache_80_102/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_103/docker-compose.yml b/ci/apache_80_103/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_104/docker-compose.yml b/ci/apache_80_104/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_105/docker-compose.yml b/ci/apache_80_105/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_106/docker-compose.yml b/ci/apache_80_106/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_107/docker-compose.yml b/ci/apache_80_107/docker-compose.yml
@@ -0,0 +1,22 @@
+# docker-compose.yml for travis ci testing
+version: '3.1'
+services:
+ mysql:
+ restart: always
+ image: mariadb:10.7
+ command: ['mysqld','--character-set-server=utf8mb4']
+ environment:
+ MYSQL_ROOT_PASSWORD: root
+ openemr:
+ restart: always
+ image: openemr/openemr:flex-3.15-8
+ ports:
+ - 80:80
+ - 443:443
+ volumes:
+ - ../../:/var/www/localhost/htdocs/openemr
+ environment:
+ FORCE_NO_BUILD_MODE: "yes"
+ EMPTY: "yes"
+ depends_on:
+ - mysql
diff --git a/ci/apache_80_57/docker-compose.yml b/ci/apache_80_57/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/apache_80_8/docker-compose.yml b/ci/apache_80_8/docker-compose.yml
@@ -9,7 +9,7 @@ services:
  MYSQL_ROOT_PASSWORD: root
  openemr:
  restart: always
- image: openemr/openemr:flex-3.14-8
+ image: openemr/openemr:flex-3.15-8
  ports:
  - 80:80
  - 443:443

diff --git a/ci/ciLibrary.source b/ci/ciLibrary.source
@@ -16,8 +16,12 @@ composer_github_auth() {
  githubTokenRateLimit=`echo $githubTokenRateLimitRequest | jq '.rate.remaining'`
  echo "Number of github api requests remaining is $githubTokenRateLimit"
  if [ "$githubTokenRateLimit" -gt 500 ]; then
- echo "Using composer github api token"
- composer config --global --auth github-oauth.github.com 310659f0a8658693af9ccb9da8969584b598910a
+ echo "Trying to use composer github api token"
+ if `composer config --global --auth github-oauth.github.com "$githubToken"`; then
+ echo "github composer token worked"
+ else
+ echo "github composer token did not work"
+ fi
  else
  echo "Not using composer github api token"
  fi