Skip to content

Commit

Permalink
Merge pull request moodlehq#236 from stronk7/bump_to_box4
Browse files Browse the repository at this point in the history
Update to current box version (phar packaging)
  • Loading branch information
stronk7 authored Sep 8, 2023
2 parents 225a511 + 6012a6d commit 58d935e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v3

- name: Setup PHP 7.4
- name: Setup PHP 8.1
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.1
ini-values: phar.readonly = false

- name: Build PHAR
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ ifeq (, $(wildcard vendor))
endif

build/box.phar:
@cd build && curl -LSs https://box-project.github.io/box2/installer.php | php
curl -LSs https://github.com/box-project/box/releases/download/4.3.8/box.phar -o build/box.phar

build/moodle-plugin-ci.phar: build/box.phar
$(COMPOSER) install --no-dev --prefer-dist --classmap-authoritative --quiet
php -d memory_limit=-1 -d phar.readonly=false build/box.phar build
php -d memory_limit=-1 -d phar.readonly=false build/box.phar compile
$(COMPOSER) install --prefer-dist --quiet

docs/CLI.md: $(CMDS)
Expand Down
9 changes: 3 additions & 6 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"chmod": "0755",
"compression": "GZ",
"directories": [
"src",
Expand Down Expand Up @@ -39,13 +38,11 @@
]
}
],
"compactors": "Herrera\\Box\\Compactor\\Php",
"compactors": "KevinGH\\Box\\Compactor\\Php",
"git-version": "package_version",
"replacements": {
"is_boxed": "BOXED"
},
"intercept": true,
"main": "bin/moodle-plugin-ci",
"output": "build/moodle-plugin-ci.phar",
"stub": true
}
"output": "build/moodle-plugin-ci.phar"
}
3 changes: 3 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).

## [Unreleased]
### Fixed
- Updated the PHAR packaging utility ([box](https://github.com/box-project/box)) to actual one, to avoid various issues happening with PHP 8.1 and up.

## [4.1.2] - 2023-09-02
### Changed
- Modified `moodle-local_ci` composer dependencies and manage them normally, removing some ancient bits that have [stopped working with Composer 2.6.0 and up](https://github.com/composer/composer/issues/11613).
Expand Down

0 comments on commit 58d935e

Please sign in to comment.