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
8 changes: 5 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
on: push
on:
push:
pull_request:

name: Build

Expand All @@ -14,7 +16,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

steps:
- name: "Checkout code"
Expand All @@ -34,7 +36,7 @@ jobs:
composer-options: "--optimize-autoloader"

- name: "Download humbug/box"
run: wget --no-clobber --output-document=./box https://github.com/humbug/box/releases/download/3.8.5/box.phar || true
run: wget --no-clobber --output-document=./box https://github.com/humbug/box/releases/download/3.11.0/box.phar || true

- name: "Make humbug/box executable"
run: chmod +x ./box
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

steps:
- name: "Checkout code"
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

steps:
- name: "Checkout code"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"

steps:
-
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
FROM php:7.4-cli-alpine as build
FROM php:8.0-cli-alpine as build

RUN apk add git # required for box to detect the version
RUN apk add --update icu-dev && docker-php-ext-install -j$(nproc) intl # related to https://github.com/box-project/box/issues/516

COPY --from=composer:1.9.3 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.0.8 /usr/bin/composer /usr/bin/composer

WORKDIR /usr/src/app
ADD . /usr/src/app

RUN composer install --classmap-authoritative --no-interaction

ADD https://github.com/humbug/box/releases/download/3.8.4/box.phar ./box.phar
ADD https://github.com/humbug/box/releases/download/3.11.0/box.phar ./box.phar
RUN php box.phar compile

FROM php:7.4-cli-alpine
FROM php:8.0-cli-alpine

LABEL "com.github.actions.name"="DOCtor-RST"
LABEL "com.github.actions.description"="check *.rst files against given rules"
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "project",
"license": "MIT",
"require": {
"php": "^7.4",
"php": "^8.0",
"ext-ctype": "*",
"ext-iconv": "*",
"composer/semver": "^1.4",
"composer/semver": "^3.0",
"doctrine/annotations": "^1.8",
"ondram/ci-detector": "^3.5",
"symfony/config": "^5.0",
Expand Down
Loading