Skip to content

Commit c8e62f6

Browse files
authored
Merge branch 'e2b-dev:main' into main
2 parents a83b938 + e90a75f commit c8e62f6

423 files changed

Lines changed: 7042 additions & 2708 deletions

File tree

Some content is hidden

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

.env.gcp.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ CLICKHOUSE_STATEFUL_DISK_SIZE_GB=
108108
REDIS_MANAGED=
109109
# Redis shard count (default: 1)
110110
REDIS_SHARD_COUNT=
111+
# GCP managed Redis/Valkey node type (default: STANDARD_SMALL)
112+
GCP_REDIS_NODE_TYPE=
111113
# GCP managed Redis/Valkey engine version (default: VALKEY_8_0)
112114
GCP_REDIS_ENGINE_VERSION=
113115

.github/actions/start-services/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ runs:
5959
shell: bash
6060

6161
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@v3
62+
uses: docker/setup-buildx-action@v4
6363

6464
- name: Build codegen image with caching
65-
uses: docker/build-push-action@v6
65+
uses: docker/build-push-action@v7
6666
with:
6767
context: packages/clickhouse
6868
file: packages/clickhouse/Dockerfile

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,13 @@ jobs:
114114

115115
- name: Upload test results to Codecov
116116
if: ${{ !cancelled() && env.CODECOV_TOKEN != '' && hashFiles('tests/integration/test-results.xml') != '' }}
117-
uses: codecov/test-results-action@v1
117+
uses: codecov/codecov-action@v6
118118
with:
119119
token: ${{ secrets.CODECOV_TOKEN }}
120120
files: tests/integration/test-results.xml
121121
flags: integration
122122
disable_search: true
123+
report_type: test_results
123124

124125
- name: Upload Service Logs
125126
if: ${{ always() && inputs.publish == true }}

.github/workflows/pr-no-generated-changes.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ jobs:
5959
./scripts/fix-tracers.sh
6060
./scripts/fix-meters.sh
6161
62-
- uses: jdx/mise-action@v3
63-
with:
64-
install_args: "buf protoc protoc-gen-connect-go protoc-gen-go protoc-gen-go-grpc"
62+
- uses: jdx/mise-action@v4
6563

6664
- name: Generate all code
6765
run: make generate # cannot do this in parallel, as there are some race conditions

.github/workflows/pr-tests-arm64.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178

179179
- name: Upload coverage to Codecov
180180
if: ${{ !cancelled() && env.CODECOV_TOKEN != '' && hashFiles(format('{0}/coverage.txt', matrix.package)) != '' }}
181-
uses: codecov/codecov-action@v5
181+
uses: codecov/codecov-action@v6
182182
with:
183183
token: ${{ secrets.CODECOV_TOKEN }}
184184
files: ${{ matrix.package }}/coverage.txt
@@ -187,9 +187,10 @@ jobs:
187187

188188
- name: Upload test results to Codecov
189189
if: ${{ !cancelled() && env.CODECOV_TOKEN != '' && hashFiles(format('{0}/junit.xml', matrix.package)) != '' }}
190-
uses: codecov/test-results-action@v1
190+
uses: codecov/codecov-action@v6
191191
with:
192192
token: ${{ secrets.CODECOV_TOKEN }}
193193
files: ${{ matrix.package }}/junit.xml
194194
flags: ${{ matrix.flag }},unit
195195
disable_search: true
196+
report_type: test_results

.github/workflows/pr-tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- name: Upload coverage to Codecov
137137
if: ${{ !cancelled() && env.CODECOV_TOKEN != '' &&
138138
hashFiles(format('{0}/coverage.txt', matrix.package)) != '' }}
139-
uses: codecov/codecov-action@v5
139+
uses: codecov/codecov-action@v6
140140
with:
141141
token: ${{ secrets.CODECOV_TOKEN }}
142142
files: ${{ matrix.package }}/coverage.txt
@@ -146,12 +146,13 @@ jobs:
146146
- name: Upload test results to Codecov
147147
if: ${{ !cancelled() && env.CODECOV_TOKEN != '' &&
148148
hashFiles(format('{0}/junit.xml', matrix.package)) != '' }}
149-
uses: codecov/test-results-action@v1
149+
uses: codecov/codecov-action@v6
150150
with:
151151
token: ${{ secrets.CODECOV_TOKEN }}
152152
files: ${{ matrix.package }}/junit.xml
153153
flags: ${{ matrix.flag }},unit
154154
disable_search: true
155+
report_type: test_results
155156

156157
validate-iac:
157158
name: Validate terraform

.mockery.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,6 @@ packages:
8080
filename: mocks_test.go
8181
pkgname: utils
8282

83-
github.com/e2b-dev/infra/packages/orchestrator/pkg/sandbox/build:
84-
interfaces:
85-
Diff:
86-
config:
87-
dir: packages/orchestrator/pkg/sandbox/build/mocks
88-
filename: mockdiff.go
89-
pkgname: buildmocks
90-
9183
github.com/e2b-dev/infra/packages/api/internal/handlers:
9284
interfaces:
9385
featureFlagsClient:

.pr_agent.toml

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

.tool-versions

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ buf 1.28.1
22
bun 1.3.2
33
gcloud 534.0.0
44
golang 1.25.9
5-
golangci-lint 2.8.0
5+
go:golang.org/x/tools/gopls 0.21.1
6+
go:github.com/vektra/mockery/v3 v3.5.0
7+
golangci-lint 2.7.2
68
packer 1.13.1
79
protoc 29.3
810
protoc-gen-connect-go 1.18.1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ lint:
205205

206206
.PHONY: generate-mocks
207207
generate-mocks:
208-
go run github.com/vektra/mockery/v3@v3.5.0
208+
GOOS=linux mockery
209209

210210
.PHONY: tidy
211211
tidy:

0 commit comments

Comments
 (0)