Skip to content

Add composer lock file to git and fix code styling #1093

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.

Sign up for GitHub

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

Merged
christianlupus merged 4 commits into from
Jul 22, 2022
Merged

Add composer lock file to git and fix code styling #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1421892
Add composer lock file to git and fix code styling
christianlupus Jul 21, 2022
12d21da
Update changelog
christianlupus Jul 21, 2022
63f40b2
Pin PHP version to prevent machine dependencies
christianlupus Jul 22, 2022
9d0d492
Fix tests
christianlupus Jul 22, 2022
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
3 changes: 3 additions & 0 deletions .github/actions/run-tests/tests/entrypoints/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ rsync -a /cookbook/ custom_apps/cookbook/ --delete --delete-delay --delete-exclu
pushd custom_apps/cookbook

if [ $INSTALL_COMPOSER_DEPS = 'y' ]; then
echo "Checking composer compatibility"
composer check-platform-reqs

echo "Installing/updating composer dependencies"
composer install
fi
Expand Down
45 changes: 34 additions & 11 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ jobs:
restore-keys: |
${{ runner.os }}-node-${{ steps.date.outputs.date }}-
${{ runner.os }}-node-
- name: Cache composer files
uses: actions/[email protected]
with:
path: |
vendor
key: ${{ runner.os }}-composer-${{ steps.date.outputs.date }}-${{ hashFiles('composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-${{ steps.date.outputs.date }}-
${{ runner.os }}-composer-
- name: Get PHP version
shell: bash
run: php -v
Expand Down Expand Up @@ -108,7 +117,7 @@ jobs:
coreVersion:
- stable24
phpVersion:
- "7"
- "8.1"
httpServer:
- "apache"
mayFail:
Expand All @@ -117,35 +126,40 @@ jobs:
# Test different core versions additionally
- database: mysql
coreVersion: stable19
phpVersion: "7"
phpVersion: "7.4"
httpServer: "apache"
mayFail: false
- database: mysql
coreVersion: stable20
phpVersion: "7"
phpVersion: "7.4"
httpServer: "apache"
mayFail: false
- database: mysql
coreVersion: stable21
phpVersion: "7"
phpVersion: "8.0"
httpServer: "apache"
mayFail: false
- database: mysql
coreVersion: stable22
phpVersion: "7"
phpVersion: "8.0"
httpServer: "apache"
mayFail: false
- database: mysql
coreVersion: stable23
phpVersion: "7"
phpVersion: "8.0"
httpServer: "apache"
mayFail: false

# Test different PHP versions additionally
# - database: mysql
# # stable24 branch needs PHP 7.4
# coreVersion: stable23
# phpVersion: "7.3"
# httpServer: "apache"
# mayFail: false
- database: mysql
# stable24 branch needs PHP 7.4
coreVersion: stable23
phpVersion: "7.3"
coreVersion: stable24
phpVersion: "7.4"
httpServer: "apache"
mayFail: false
- database: mysql
Expand All @@ -157,14 +171,14 @@ jobs:
# Test different HTTP server
- database: mysql
coreVersion: stable24
phpVersion: "7"
phpVersion: "8.1"
httpServer: "nginx"
mayFail: false

# Test against master (optionally)
- database: mysql
coreVersion: master
phpVersion: "7"
phpVersion: "8.1"
httpServer: "apache"
mayFail: true

Expand Down Expand Up @@ -351,6 +365,15 @@ jobs:
restore-keys: |
${{ runner.os }}-node-${{ steps.date.outputs.date }}-
${{ runner.os }}-node-
- name: Use cache for Composer
uses: actions/[email protected]
with:
path: |
vendor
key: ${{ runner.os }}-composer-${{ steps.date.outputs.date }}-${{ hashFiles('composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-${{ steps.date.outputs.date }}-
${{ runner.os }}-composer-

- name: Update NPM
shell: bash
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
- Prevent slow loading of recipes due to iteration over all files
[#1072](https://github.com/nextcloud/cookbook/pull/1072) @christianlupus

### Maintenance
- Add composer.json to version control to have unique installed dependency versions
[#1093](https://github.com/nextcloud/cookbook/pull/1093) @christianlupus


## 0.9.13 - 2022-07-02

Expand Down
5 changes: 5 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,10 @@
"cs:check": "./vendor/bin/php-cs-fixer fix --dry-run --diff",
"cs:fix": "./vendor/bin/php-cs-fixer fix",
"lint:lint": "find . -name '*.php' -not -path './vendor/*' -not -path './.github/*' -not -path './node_modules/*' -not -path './tests/phpunit/*' -print0 | xargs -0 -n1 php -l"
},
"config": {
"platform": {
"php": "7.4"
}
}
}
Loading