Skip to content

Commit

Permalink
Merge branch 'GT-471-Shib/CheckIn-Token-reads-config-file' of https:/…
Browse files Browse the repository at this point in the history
…/github.com/Sae126V/gocdb into GT-471-Shib/CheckIn-Token-reads-config-file
  • Loading branch information
Sae126V committed Dec 4, 2024
2 parents 2a8cccf + 5091398 commit 965b3fa
Show file tree
Hide file tree
Showing 6 changed files with 1,054 additions and 3,226 deletions.
22 changes: 5 additions & 17 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,10 @@ jobs:
matrix:
# Define jobs for all combinations of php, mariadb and extension, up to "include"
# Tests will be performed for each combination
php-version: ["5.4", "5.5", "5.6", "7.0", "7.1", "7.4"]
mariadb-version: ["10.3"]
php-version: ["7.4"]
mariadb-version: ["10.11", "11.4", "11", "latest"]
extension: ["pdo_mysql"]
include:
- php-version: "5.4"
composer-json: "composer-5.4.json"
- php-version: "5.5"
composer-json: "composer-5.4.json"
- php-version: "5.6"
composer-json: "composer-5.4.json"
- php-version: "7.0"
composer-json: "composer-5.4.json"
- php-version: "7.1"
composer-json: "composer-5.4.json"
- php-version: "7.4"
composer-json: "composer.json"
composer-json: ["composer.json"]

services:
mariadb:
Expand All @@ -39,7 +27,7 @@ jobs:
MYSQL_USER: "user"
MYSQL_PASSWORD: "password"

options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
ports:
- "3306:3306"

Expand Down Expand Up @@ -82,4 +70,4 @@ jobs:
run: .github/actions/run_tests.sh

- name: "Upload to Codecov"
uses: "codecov/codecov-action@v4"
uses: "codecov/codecov-action@v5"
15 changes: 0 additions & 15 deletions composer-5.4.json

This file was deleted.

Loading

0 comments on commit 965b3fa

Please sign in to comment.