Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,14 @@ on:

jobs:
Acceptance:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
php:
- 7.2
- 7.3
- 7.4
php:
- 8.1
steps:
- uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
- uses: actions/checkout@v3
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@ on:

jobs:
diff:
runs-on: ubuntu-latest

runs-on: ubuntu-22.04
strategy:
matrix:
php:
- 8.1
steps:
# check out base ref and build site into old/
- uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
- uses: actions/checkout@v3
- uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: ${{ matrix.php }}
coverage: none
ref: ${{ github.event.pull_request.base.sha }}
- run: composer install
- run: vendor/bin/sculpin generate --output-dir=old

# check out head ref and build site into new/
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
clean: false # Prevent removing files in old/
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Source code for https://clue.engineering/
Install dependencies:

```bash
$ composer install
composer install
```

Build website:

```bash
$ vendor/bin/sculpin generate
vendor/bin/sculpin generate
```

This will create a `build/` directory that contains the static website that can
Expand All @@ -31,7 +31,7 @@ Additionally, Apache has been configured to cache static files for 1 day.
For testing purposes, you can use the official `php` docker image like this:

```bash
$ docker run -it --rm -p 80:80 -v "$PWD"/build:/var/www/html php:7.4-apache sh -c "ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
docker run -it --rm -p 80:80 -v "$PWD"/build:/var/www/html php:8.1-apache sh -c "ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
```

## Tests
Expand All @@ -40,11 +40,11 @@ You can run some simple acceptance tests to verify the deployed website works
as expected by running:

```bash
$ tests/acceptance.sh https://clue.test
tests/acceptance.sh https://clue.test
```

If you're using the above `php` docker image, you can run this test like this:

```bash
$ tests/acceptance.sh http://clue.localhost
tests/acceptance.sh http://clue.localhost
```
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"require": {
"php": ">=7.2"
"php": ">=8.1"
},
"require-dev": {
"sculpin/sculpin": "^3.0"
"sculpin/sculpin": "dev-master#23a74ba as 3.2"
},
"replace": {
"sculpin/sculpin-theme-composer-plugin": "1.0.2"
},
"config": {
"platform": {
"php": "7.2"
"php": "8.1.8"
}
}
}
Loading