Skip to content

Commit

Permalink
Try to fix phpstan in ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@K-Phoen
K-Phoen committed Oct 3, 2024
1 parent e571177 commit 014cd69
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 31 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
push:
branches: [main] # so that we build a Go cache that can be re-used in PRs

env:
DEVBOX_VERSION: 0.13.1

jobs:
linters:
name: Linters
Expand All @@ -16,6 +19,7 @@ jobs:
uses: jetify-com/[email protected]
with:
enable-cache: 'true'
devbox-version: ${{ env.DEVBOX_VERSION }}

- name: Run golangci-lint
run: make lint
Expand All @@ -31,6 +35,7 @@ jobs:
uses: jetify-com/[email protected]
with:
enable-cache: 'true'
devbox-version: ${{ env.DEVBOX_VERSION }}

- name: Tests
run: make tests
Expand All @@ -50,6 +55,7 @@ jobs:
uses: jetify-com/[email protected]
with:
enable-cache: 'true'
devbox-version: ${{ env.DEVBOX_VERSION }}

- name: Clone kind-registry
run: git clone --depth=1 https://github.com/grafana/kind-registry.git ../kind-registry
Expand All @@ -73,7 +79,7 @@ jobs:
run: devbox run gradle build -p generated/java

- name: Lint generated PHP code with phpstan
run: devbox run phpstan analyze --memory-limit 256M -c .config/ci/php/phpstan.neon
run: devbox run phpstan analyze --memory-limit 256M -v -c .config/ci/php/phpstan.neon

- name: Lint generated PHP code with psalm
run: devbox run psalm -c .config/ci/php/psalm.xml generated/php
Expand All @@ -89,6 +95,7 @@ jobs:
uses: jetify-com/[email protected]
with:
enable-cache: 'true'
devbox-version: ${{ env.DEVBOX_VERSION }}

- name: Clone kind-registry
run: git clone --depth=1 https://github.com/grafana/kind-registry.git ../kind-registry
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/grafana-foundation-sdk-diff-preview.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Foundation-sdk diff preview
on:
pull_request: ~

env:
DEVBOX_VERSION: 0.13.1

jobs:
sdk_diff:
name: Generate diff
Expand All @@ -14,6 +17,7 @@ jobs:
uses: jetify-com/[email protected]
with:
enable-cache: 'true'
devbox-version: ${{ env.DEVBOX_VERSION }}

- name: Dry-run release
shell: bash
Expand Down
60 changes: 30 additions & 30 deletions devbox.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,50 +175,50 @@
}
},
"[email protected]": {
"last_modified": "2024-09-13T05:52:00Z",
"resolved": "github:NixOS/nixpkgs/673d99f1406cb09b8eb6feab4743ebdf70046557#nodePackages.ts-node",
"last_modified": "2024-09-23T10:58:17Z",
"resolved": "github:NixOS/nixpkgs/568bfef547c14ca438c56a0bece08b8bb2b71a9c#nodePackages.ts-node",
"source": "devbox-search",
"version": "10.9.2",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/kmchq7l6lyfl6q5dxh82kyvxd2r2hrgy-ts-node-10.9.2",
"path": "/nix/store/3zm6xc7hzn1msjha4srgqphdi3l4cxr9-ts-node-10.9.2",
"default": true
}
],
"store_path": "/nix/store/kmchq7l6lyfl6q5dxh82kyvxd2r2hrgy-ts-node-10.9.2"
"store_path": "/nix/store/3zm6xc7hzn1msjha4srgqphdi3l4cxr9-ts-node-10.9.2"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/6kgfhn3mczsgv39b15l1iv4vhjmiyfvp-ts-node-10.9.2",
"path": "/nix/store/56q9lbgk20cqwqlqar1mm1l1h31c7pif-ts-node-10.9.2",
"default": true
}
],
"store_path": "/nix/store/6kgfhn3mczsgv39b15l1iv4vhjmiyfvp-ts-node-10.9.2"
"store_path": "/nix/store/56q9lbgk20cqwqlqar1mm1l1h31c7pif-ts-node-10.9.2"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/49pyi3l8xd1cw5fw5rgd3jy9782184p7-ts-node-10.9.2",
"path": "/nix/store/vpihhsb85fx3qyy87l6f77fpw7sm0y8d-ts-node-10.9.2",
"default": true
}
],
"store_path": "/nix/store/49pyi3l8xd1cw5fw5rgd3jy9782184p7-ts-node-10.9.2"
"store_path": "/nix/store/vpihhsb85fx3qyy87l6f77fpw7sm0y8d-ts-node-10.9.2"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/l8phr8qy3mdj1wy0cy4afl27acc8f28b-ts-node-10.9.2",
"path": "/nix/store/nvmzzqg1x44w0lys42ws7pkvbwgh6ap9-ts-node-10.9.2",
"default": true
}
],
"store_path": "/nix/store/l8phr8qy3mdj1wy0cy4afl27acc8f28b-ts-node-10.9.2"
"store_path": "/nix/store/nvmzzqg1x44w0lys42ws7pkvbwgh6ap9-ts-node-10.9.2"
}
}
},
Expand Down Expand Up @@ -288,98 +288,98 @@
}
},
"[email protected]": {
"last_modified": "2024-09-10T15:01:03Z",
"resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#php83Packages.phpstan",
"last_modified": "2024-09-28T20:36:15Z",
"resolved": "github:NixOS/nixpkgs/19d2ec01a20afa6a816a10d3a57b4c49b3d1293b#php83Packages.phpstan",
"source": "devbox-search",
"version": "1.11.8",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/pyw05w2xsnndx3k1s4yns80gax4l6jm5-phpstan-1.11.8",
"path": "/nix/store/5sidqrbm6jwgglzfp5j1c5sc4m46qxz2-phpstan-1.11.8",
"default": true
}
],
"store_path": "/nix/store/pyw05w2xsnndx3k1s4yns80gax4l6jm5-phpstan-1.11.8"
"store_path": "/nix/store/5sidqrbm6jwgglzfp5j1c5sc4m46qxz2-phpstan-1.11.8"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/raxgmljp14ilfyi8jzngqa28c1wl35c6-phpstan-1.11.8",
"path": "/nix/store/7msdy2byk1xzn5pmdqpxg4vzs97qhlcm-phpstan-1.11.8",
"default": true
}
],
"store_path": "/nix/store/raxgmljp14ilfyi8jzngqa28c1wl35c6-phpstan-1.11.8"
"store_path": "/nix/store/7msdy2byk1xzn5pmdqpxg4vzs97qhlcm-phpstan-1.11.8"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/icd857ch4plc4qw4fnnixhnmibr926dm-phpstan-1.11.8",
"path": "/nix/store/r8ph0bh12wywfnwlnraqrfj5i4947d8b-phpstan-1.11.8",
"default": true
}
],
"store_path": "/nix/store/icd857ch4plc4qw4fnnixhnmibr926dm-phpstan-1.11.8"
"store_path": "/nix/store/r8ph0bh12wywfnwlnraqrfj5i4947d8b-phpstan-1.11.8"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/dicy20zii0b1xpqflh4jxmz0ywsmj04k-phpstan-1.11.8",
"path": "/nix/store/vvbcf62600lnrnsz6wnxi8l4lrp9advr-phpstan-1.11.8",
"default": true
}
],
"store_path": "/nix/store/dicy20zii0b1xpqflh4jxmz0ywsmj04k-phpstan-1.11.8"
"store_path": "/nix/store/vvbcf62600lnrnsz6wnxi8l4lrp9advr-phpstan-1.11.8"
}
}
},
"[email protected]": {
"last_modified": "2024-09-10T15:01:03Z",
"resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#php83Packages.psalm",
"last_modified": "2024-09-28T20:36:15Z",
"resolved": "github:NixOS/nixpkgs/19d2ec01a20afa6a816a10d3a57b4c49b3d1293b#php83Packages.psalm",
"source": "devbox-search",
"version": "5.25.0",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/2ipakcda8icl7r86s0qjkd627mrcfvl3-psalm-5.25.0",
"path": "/nix/store/h1wnfcnaw7nhp357dc0wcaz9w8ikmyv8-psalm-5.25.0",
"default": true
}
],
"store_path": "/nix/store/2ipakcda8icl7r86s0qjkd627mrcfvl3-psalm-5.25.0"
"store_path": "/nix/store/h1wnfcnaw7nhp357dc0wcaz9w8ikmyv8-psalm-5.25.0"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/w32iqghc4gxydkfqgrds69i0bg23jjaf-psalm-5.25.0",
"path": "/nix/store/4w4m1r72la7mziv8ac83ar0jsn12jrmp-psalm-5.25.0",
"default": true
}
],
"store_path": "/nix/store/w32iqghc4gxydkfqgrds69i0bg23jjaf-psalm-5.25.0"
"store_path": "/nix/store/4w4m1r72la7mziv8ac83ar0jsn12jrmp-psalm-5.25.0"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/phmq70pf9wmqm0vf03qhf9w9zmszcjf9-psalm-5.25.0",
"path": "/nix/store/p38qj9ckg20ycg3avdbin9ip8h6nxpkh-psalm-5.25.0",
"default": true
}
],
"store_path": "/nix/store/phmq70pf9wmqm0vf03qhf9w9zmszcjf9-psalm-5.25.0"
"store_path": "/nix/store/p38qj9ckg20ycg3avdbin9ip8h6nxpkh-psalm-5.25.0"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/l5l5pbf9yny98982f3rd2z8dsnaas5sg-psalm-5.25.0",
"path": "/nix/store/zq02h3hv6464b666qjdyyybpnmvr8zhl-psalm-5.25.0",
"default": true
}
],
"store_path": "/nix/store/l5l5pbf9yny98982f3rd2z8dsnaas5sg-psalm-5.25.0"
"store_path": "/nix/store/zq02h3hv6464b666qjdyyybpnmvr8zhl-psalm-5.25.0"
}
}
},
Expand Down

0 comments on commit 014cd69

Please sign in to comment.