Skip to content

Commit 8e33c8c

Browse files
committed
[IGNORE] regenerate package lock for snyk updates
1 parent 2ec28c2 commit 8e33c8c

File tree

4 files changed

+79
-19
lines changed

4 files changed

+79
-19
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
name: ci
22
on:
3+
workflow_run:
4+
workflows: ['snyk']
5+
types:
6+
- completed
7+
branches:
8+
- snyk-fix-*
9+
- snyk-upgrade-*
310
push:
411
branches:
512
- main
@@ -11,7 +18,7 @@ on:
1118

1219
jobs:
1320
build:
14-
name: "build"
21+
name: 'build'
1522
runs-on: ubuntu-latest
1623
steps:
1724
- name: checkout
@@ -22,11 +29,11 @@ jobs:
2229
enable_npm: true
2330
enable_go: true
2431
enable_cue: true
25-
cue_version: "v0.12.0"
32+
cue_version: 'v0.12.0'
2633
- name: install percli
2734
uses: perses/cli-actions/actions/[email protected]
2835
with:
29-
cli-version: "v0.51.1"
36+
cli-version: 'v0.51.1'
3037
- name: cache cue deps
3138
uses: actions/cache@v4
3239
with:
@@ -52,7 +59,7 @@ jobs:
5259
!node_modules
5360
5461
lint-npm:
55-
name: "lint-npm"
62+
name: 'lint-npm'
5663
runs-on: ubuntu-latest
5764
steps:
5865
- name: checkout
@@ -65,7 +72,7 @@ jobs:
6572
- run: npm run lint
6673

6774
test-npm:
68-
name: "test-npm"
75+
name: 'test-npm'
6976
runs-on: ubuntu-latest
7077
steps:
7178
- name: checkout
@@ -78,7 +85,7 @@ jobs:
7885
- run: npm run test
7986

8087
type-check:
81-
name: "type-check"
88+
name: 'type-check'
8289
runs-on: ubuntu-latest
8390
steps:
8491
- name: checkout
@@ -91,7 +98,7 @@ jobs:
9198
- run: npm run type-check
9299

93100
lint-schemas:
94-
name: "Validate plugin schemas"
101+
name: 'Validate plugin schemas'
95102
runs-on: ubuntu-latest
96103
steps:
97104
- name: checkout
@@ -101,11 +108,11 @@ jobs:
101108
with:
102109
enable_go: true
103110
enable_cue: true
104-
cue_version: "v0.12.0"
111+
cue_version: 'v0.12.0'
105112
- name: Install percli
106113
uses: perses/cli-actions/actions/[email protected]
107114
with:
108-
cli-version: "v0.51.1"
115+
cli-version: 'v0.51.1'
109116
- uses: actions/cache@v4
110117
id: cache
111118
with:
@@ -133,7 +140,7 @@ jobs:
133140
version: v2.3.0
134141
- run: make golangci-lint
135142
module-check:
136-
name: "Check plugin modules"
143+
name: 'Check plugin modules'
137144
runs-on: ubuntu-latest
138145
steps:
139146
- name: checkout
@@ -143,7 +150,7 @@ jobs:
143150
with:
144151
enable_go: true
145152
enable_cue: true
146-
cue_version: "v0.12.0"
153+
cue_version: 'v0.12.0'
147154
- uses: actions/cache@v4
148155
id: cache
149156
with:
@@ -157,8 +164,8 @@ jobs:
157164
run: git diff --exit-code -- */cue.mod
158165

159166
release:
160-
name: "release"
161-
needs: "build"
167+
name: 'release'
168+
needs: 'build'
162169
runs-on: ubuntu-latest
163170
permissions:
164171
contents: write
@@ -174,8 +181,8 @@ jobs:
174181
enable_npm: true
175182
enable_go: true
176183
enable_cue: true
177-
cue_version: "v0.12.0"
178-
nvmrc_path: "./.nvmrc"
184+
cue_version: 'v0.12.0'
185+
nvmrc_path: './.nvmrc'
179186
- name: Download archive
180187
uses: actions/download-artifact@v4
181188
with:

.github/workflows/doc.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
name: doc
22
on:
3+
workflow_run:
4+
workflows: ['snyk']
5+
types:
6+
- completed
7+
branches:
8+
- snyk-fix-*
9+
- snyk-upgrade-*
310
push:
411
branches:
512
- main
@@ -12,7 +19,7 @@ on:
1219

1320
jobs:
1421
docs-fmt:
15-
name: "Check docs format"
22+
name: 'Check docs format'
1623
runs-on: ubuntu-latest
1724
steps:
1825
- name: checkout
@@ -25,5 +32,3 @@ jobs:
2532
run: go install github.com/bwplotka/mdox@latest
2633
- name: check docs
2734
run: make checkdocs
28-
29-

.github/workflows/snyk.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: snyk
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
push:
7+
branches:
8+
- snyk-fix-*
9+
- snyk-upgrade-*
10+
merge_group:
11+
12+
jobs:
13+
lockfile-update:
14+
name: 'regenerate lockfile'
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: write
18+
if: startsWith(github.head_ref, 'snyk-') || startsWith(github.ref_name, 'snyk-')
19+
outputs:
20+
lockfile-updated: ${{ steps.lockfile-changes.outputs.has_changes }}
21+
steps:
22+
- name: checkout
23+
uses: actions/checkout@v4
24+
with:
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
fetch-depth: 0
27+
28+
- uses: perses/[email protected]
29+
- uses: ./.github/perses-ci/actions/setup_environment
30+
with:
31+
enable_npm: true
32+
- name: install dependencies
33+
run: npm install
34+
35+
- name: check for lockfile changes
36+
id: lockfile-changes
37+
run: |
38+
if git diff --quiet package-lock.json; then
39+
echo "has_changes=false" >> $GITHUB_OUTPUT
40+
else
41+
echo "has_changes=true" >> $GITHUB_OUTPUT
42+
fi
43+
44+
- uses: stefanzweifel/git-auto-commit-action@v6
45+
if: steps.lockfile-changes.outputs.has_changes == 'true'
46+
with:
47+
commit_message: '[IGNORE] automated lockfile update'
48+
file_pattern: 'package-lock.json'

tempo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"dependencies": {
2727
"@codemirror/autocomplete": "^6.18.4",
2828
"@lezer/highlight": "^1.2.1x",
29-
"@grafana/lezer-traceql": "^0.0.20"
29+
"@grafana/lezer-traceql": "^0.0.22"
3030
},
3131
"peerDependencies": {
3232
"@emotion/react": "^11.7.1",

0 commit comments

Comments
 (0)