Skip to content

Commit

Permalink
Update dependencies (#99)
Browse files Browse the repository at this point in the history
* Update guzzle and easyrdf versions
* Update php requirement
* Update test dependencies
* Need the base uri passed in to store it.
* Fix actions
* Remove mockery
* Allow passing in a handler stack
* Allowing string, resource or stream to saveResource/createResource
  • Loading branch information
whikloj authored Apr 26, 2023
1 parent 42a35da commit 623d82e
Show file tree
Hide file tree
Showing 20 changed files with 635 additions and 478 deletions.
82 changes: 82 additions & 0 deletions .github/workflows/build-2.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the 1.x branch
push:
branches: [ 2.x ]
pull_request:
branches: [ 2.x ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
php-versions: ["7.4", "8.0", "8.1"]
experimental: [false]

name: PHP ${{ matrix.php-versions }}

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout code
uses: actions/checkout@v3
with:
path: build_dir

- name: Checkout islandora_ci
uses: actions/checkout@v3
with:
repository: islandora/islandora_ci
ref: github-actions
path: islandora_ci

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: composer:v2

- name: Set environment variables
run: |
echo "SCRIPT_DIR=$GITHUB_WORKSPACE/islandora_ci" >> $GITHUB_ENV
- name: Get composer cache directory
id: composer-cache
run: echo "composer-cache-dir=$(composer config cache-files-dir)" >> $GITHUB_ENV

- name: Cache Composer dependencies
uses: actions/cache@v3
with:
path: ${{ env.composer-cache-dir }}
key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-${{ matrix.php-version }}

- name: composer install
run: |
cd $GITHUB_WORKSPACE/build_dir
composer install
- name: Line endings
run: $SCRIPT_DIR/line_endings.sh $GITHUB_WORKSPACE

- name: Test scripts
run: |
cd $GITHUB_WORKSPACE/build_dir
composer test
- name: Codecov
uses: codecov/codecov-action@v3

19 changes: 13 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"issues": "https://github.com/Islandora/documentation/issues"
},
"require": {
"php": ">=7.3",
"guzzlehttp/guzzle": "^6.1.0",
"easyrdf/easyrdf": "^0.9 || ^1",
"php": ">=7.4",
"guzzlehttp/guzzle": "^6.5 || ^7.4",
"easyrdf/easyrdf": "^1",
"ml/json-ld": "^1.0.4"
},
"require-dev": {
"donatj/mock-webserver": "^2.6",
"phpunit/phpunit": "^9.0",
"squizlabs/php_codesniffer": "^3.0",
"sebastian/phpcpd": "^6.0",
"mockery/mockery": "^0.9"
"sebastian/phpcpd": "^6.0"
},
"scripts": {
"check": [
Expand Down Expand Up @@ -48,6 +48,13 @@
}
],
"autoload": {
"psr-4": {"Islandora\\Chullo\\": "src/"}
"psr-4": {
"Islandora\\Chullo\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Islandora\\Chullo\\Test\\": "test/"
}
}
}
Loading

0 comments on commit 623d82e

Please sign in to comment.