Skip to content
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.

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

fix: sync with Infra #200

Merged
merged 3 commits into from
Dec 22, 2023
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
4 changes: 4 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ jobs:
name: Run init
working-directory: tests/functional/init
run: make -f ../default.mk self/init
-
name: Run Infra init
working-directory: tests/functional/init
run: make -f ../default.mk init
-
name: Run build
working-directory: tests/functional/init
Expand Down
15 changes: 0 additions & 15 deletions resources/init/basic/compose.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions resources/init/basic/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"devDependencies": {
"@symfony/webpack-encore": "^1.7.0",
"@symfony/webpack-encore": "^4.5.0",
"file-loader": "^6.2.0",
"sass": "^1.45.2",
"sass-loader": "^12.4.0",
"sass-loader": "^13.3.2",
"ts-loader": "^9.2.6",
"typescript": "^4.5.4",
"typescript": "^5.3.3",
"webpack-notifier": "^1.15.0"
}
}
12 changes: 12 additions & 0 deletions tests/functional/site/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,15 @@ YASSG_SKIP_BUNDLES := Symfony\\WebpackEncoreBundle\\WebpackEncoreBundle
APP_ROOT := $(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))

include vendor/sigwin/infra/resources/YASSG/default.mk

build/docker/imgproxy:
docker compose up imgproxy -d
build/docker: build/docker/imgproxy
docker compose run --rm webpack npm ci
docker compose run --rm webpack npx encore production
docker compose run --rm --env IMGPROXY_URL=http://imgproxy:8080 app vendor/sigwin/yassg/bin/yassg yassg:generate --env prod "$(BASE_URL)"

vendor/sigwin/infra/resources/YASSG/default.mk:
mv composer.json composer.json~ && rm -f composer.lock
docker run --rm --user '$(shell id -u):$(shell id -g)' --volume '$(shell pwd):/app' --workdir /app composer:2 require sigwin/infra
mv composer.json~ composer.json && rm -f composer.lock
18 changes: 18 additions & 0 deletions tests/functional/site/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
services:
app:
image: php:8.2-alpine
environment:
BASE_URL: ${BASE_URL}
working_dir: /app
volumes:
- .:/app
tmpfs:
- /tmp
webpack:
image: node:20-alpine
environment:
BASE_URL: ${BASE_URL}
working_dir: /app
volumes:
- .:/app
tmpfs:
- /tmp
imgproxy:
image: darthsim/imgproxy:v3
environment:
Expand Down
Loading
Loading