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
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ permissions:
jobs:
auto-assign:
name: Auto assign
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
timeout-minutes: 5
steps:
- name: Assign issues and pull requests
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
jobs:
resolve-tooling-image:
name: Resolve tooling image
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
timeout-minutes: 5
outputs:
php-image: ${{ steps.config.outputs.php-image }}
Expand All @@ -28,7 +28,7 @@ jobs:
build:
name: Build
needs: resolve-tooling-image
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
timeout-minutes: 15
env:
image: ${{ needs.resolve-tooling-image.outputs.php-image }}
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
auto-review:
name: Auto review
needs: [resolve-tooling-image, build]
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
timeout-minutes: 15
steps:
- name: Checkout
Expand All @@ -74,7 +74,7 @@ jobs:
tests:
name: Tests
needs: [resolve-tooling-image, auto-review]
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
timeout-minutes: 15
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ TTY := $(shell [ -t 0 ] && echo -it)
HOST_USER := $(shell id -u):$(shell id -g)

PHP_VERSION := $(shell sed -n 's/.*"php": *"^\([0-9]*\.[0-9]*\)".*/\1/p' composer.json)
IMAGE_VERSION := 1.0.0
IMAGE_VERSION := 1.0.4
PHP_IMAGE := gustavofreze/php:${PHP_VERSION}-cli-${IMAGE_VERSION}
WORKSPACE := /var/www/html

Expand Down Expand Up @@ -66,7 +66,7 @@ help: ## Display this help message
@echo ""
@echo "$$(printf '$(GREEN)')Setup$$(printf '$(RESET)')"
@grep -E '^(configure|configure-and-update):.*?## .*$$' $(MAKEFILE_LIST) \
| awk 'BEGIN {FS = ":.*? ## "}; {printf "$(YELLOW)%-25s$(RESET) %s\n", $$1, $$2}'
| awk 'BEGIN {FS = ":.*?## "}; {printf "$(YELLOW)%-25s$(RESET) %s\n", $$1, $$2}'
@echo ""
@echo "$$(printf '$(GREEN)')Testing$$(printf '$(RESET)')"
@grep -E '^(tests|test-file):.*?## .*$$' $(MAKEFILE_LIST) \
Expand Down