Skip to content

Commit

Permalink
merge devel
Browse files Browse the repository at this point in the history
  • Loading branch information
usu committed May 4, 2024
2 parents 8ecbf4a + d8108f6 commit 7be3004
Show file tree
Hide file tree
Showing 17 changed files with 1,606 additions and 1,763 deletions.
4 changes: 2 additions & 2 deletions .ops/aws-setup/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
aws-setup:
image: pulumi/pulumi-nodejs:3.114.0
image: pulumi/pulumi-nodejs:3.115.0
container_name: 'ecamp3-aws-setup'
volumes:
- ../../.prettierrc:/.prettierrc:delegated
Expand All @@ -15,7 +15,7 @@ services:
- AWS_DEFAULT_REGION=eu-west-3

aws-cli:
image: amazon/aws-cli:2.15.42
image: amazon/aws-cli:2.15.44
container_name: 'ecamp3-aws-cli'
volumes:
- ./.aws:/root/.aws:delegated
Expand Down
733 changes: 261 additions & 472 deletions .ops/aws-setup/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .ops/aws-setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
"lint:check:prettier": "prettier --check --ignore-path .prettierignore **/*.{css,scss,json,md}"
},
"dependencies": {
"@pulumi/pulumi": "3.114.0",
"@pulumi/aws": "6.32.0",
"@pulumi/pulumi": "3.115.0",
"@pulumi/aws": "6.33.1",
"@pulumi/awsx": "2.9.0"
},
"devDependencies": {
"@babel/eslint-parser": "7.24.5",
"@types/node": "20.12.7",
"@types/node": "20.12.8",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "17.3.1",
"eslint-plugin-n": "17.4.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-promise": "6.1.1",
"prettier": "3.2.5"
Expand Down
4 changes: 2 additions & 2 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"phpstan/phpstan": "1.10.67",
"phpunit/phpunit": "10.5.20",
"rector/rector": "1.0.4",
"spatie/phpunit-snapshot-assertions": "5.1.5",
"spatie/phpunit-snapshot-assertions": "5.1.6",
"symfony/browser-kit": "7.0.7",
"symfony/css-selector": "7.0.7",
"symfony/debug-bundle": "7.0.7",
Expand All @@ -65,7 +65,7 @@
"symfony/stopwatch": "7.0.7",
"symfony/var-dumper": "7.0.7",
"symfony/web-profiler-bundle": "7.0.7",
"vimeo/psalm": "5.23.1"
"vimeo/psalm": "5.24.0"
},
"config": {
"optimize-autoloader": true,
Expand Down
89 changes: 47 additions & 42 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7be3004

Please sign in to comment.