Skip to content

Commit 01aacf0

Browse files
committed
Merge remote-tracking branch 'origin/main' into korniltsev/frontend-vibe-coding
2 parents fcee814 + d156d74 commit 01aacf0

File tree

114 files changed

+5260
-12069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+5260
-12069
lines changed

.github/workflows/backport.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Backport PR Creator
2+
on:
3+
pull_request:
4+
types:
5+
- closed
6+
- labeled
7+
8+
jobs:
9+
main:
10+
# We don't run the backporting for PRs from forks because those can't access "pyroscope-development-app" secrets in vault.
11+
# We don't use GitHub actions app (secrets.GITHUB_TOKEN) because PRs created by the bot don't trigger CI.
12+
# Also only run if the PR is merged, as an extra safe-guard.
13+
if: ${{ ! github.event.pull_request.head.repo.fork && github.event.pull_request.merged == true }}
14+
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: "read"
18+
id-token: "write"
19+
pull-requests: "write"
20+
steps:
21+
- name: Checkout Actions
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
with:
24+
repository: "grafana/grafana-github-actions"
25+
persist-credentials: false
26+
path: ./actions
27+
ref: 066cbcd084b61558d99d13c76f835c49e31b4670
28+
29+
- name: Install Actions
30+
run: npm install --production --prefix ./actions
31+
32+
- id: get-secrets
33+
uses: grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760
34+
with:
35+
repo_secrets: |
36+
GITHUB_APP_ID=pyroscope-development-app:app-id
37+
GITHUB_APP_PRIVATE_KEY=pyroscope-development-app:private-key
38+
39+
- name: Generate token
40+
id: app-token
41+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
42+
with:
43+
app-id: ${{ env.GITHUB_APP_ID }}
44+
private-key: ${{ env.GITHUB_APP_PRIVATE_KEY }}
45+
owner: ${{ github.repository_owner }}
46+
repositories: |
47+
pyroscope
48+
49+
- name: Run backport
50+
uses: ./actions/backport
51+
with:
52+
token: ${{ steps.app-token.outputs.token }}
53+
labelsToAdd: backport
54+
# The provided token needs read permissions for organization members if you want to remove the default reviewers.
55+
removeDefaultReviewers: false
56+
title: "[{{base}}] {{originalTitle}}"

.github/workflows/e2e.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ concurrency:
1212
cancel-in-progress: true
1313
permissions:
1414
contents: read
15+
env:
16+
LANG: en_US.UTF-8
17+
LC_ALL: en_US.UTF-8
1518
jobs:
1619
regular-path:
1720
strategy:
@@ -40,7 +43,7 @@ jobs:
4043
run: sudo apt-get update && sudo apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
4144
- run: make build
4245
- name: Cypress run
43-
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
46+
uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
4447
with:
4548
wait-on: http://localhost:4040/ready
4649
start: make run
@@ -74,7 +77,7 @@ jobs:
7477
- name: run nginx with /foobar/
7578
run: docker compose -f scripts/base-url/docker-compose.yaml up -d
7679
- name: Cypress run
77-
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
80+
uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
7881
with:
7982
wait-on: http://localhost:8080/foobar/ready
8083
start: |

.github/workflows_disabled/backport.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ $(BIN)/mage: Makefile go.mod
366366

367367
$(BIN)/mockery: Makefile go.mod
368368
@mkdir -p $(@D)
369-
GOBIN=$(abspath $(@D)) $(GO) install github.com/vektra/mockery/v2@v2.45.0
369+
GOBIN=$(abspath $(@D)) $(GO) install github.com/vektra/mockery/v2@v2.53.4
370370

371371
# Note: When updating the goreleaser version also update .github/workflow/release.yml and .git/workflow/weekly-release.yaml
372372
$(BIN)/goreleaser: Makefile go.mod

0 commit comments

Comments
 (0)