Skip to content

Commit 4184b58

Browse files
authored
Merge branch 'develop' into feat/monitoring
2 parents 3d6e9a9 + caee369 commit 4184b58

File tree

167 files changed

+13304
-634
lines changed

Some content is hidden

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

167 files changed

+13304
-634
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,7 @@
1-
### 🧠 AI Assistance Disclosure Policy
21

3-
> [!IMPORTANT]
4-
> Inspired by [ghostty](https://github.com/ghostty-org/ghostty/blob/main/CONTRIBUTING.md#ai-assistance-notice).
5-
> If you used **any AI assistance** while contributing to Digger, you must disclose it in this PR.
2+
### :brain: **Ai UsageDetails (if applicable):**
63

7-
---
8-
9-
#### ✅ AI Disclosure Checklist
10-
11-
- [ ] I understand that all AI assistance must be disclosed.
12-
- [ ] I did **not** use AI tools in this contribution.
13-
- [ ] I used AI tools and have disclosed details below.
14-
15-
**Details (if applicable):**
4+
IMPORTANT: Please disclose any usage of ai tooling while making this change. If you did not use any AI write "NA" below
165
> _Example: Used ChatGPT to help with doc phrasing._
176
> _Example: Code generated by Copilot; reviewed and verified manually._
187
19-
---
20-
21-
#### 💡 Notes
22-
23-
- Trivial auto-completions (single words, short phrases) don’t need disclosure.
24-
- Contributors must understand and take responsibility for any AI-assisted code.
25-
- Failure to disclose is considered disrespectful to maintainers and may delay review.

.github/release-please-config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
"release-type": "go",
2424
"component": "taco/statesman",
2525
"changelog-path": ".changelog-ignore/CHANGELOG.md"
26+
},
27+
"sandbox-sidecar": {
28+
"release-type": "node",
29+
"component": "sandbox-sidecar",
30+
"changelog-path": "CHANGELOG.md"
2631
}
2732
}
2833
}

.github/workflows/auto-tag-and-release.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88
inputs:
99
force_services:
10-
description: 'Force tag these services (comma-separated: backend_ee,drift,ui,statesman,token-service,projects-refresh)'
10+
description: 'Force tag these services (comma-separated: backend_ee,drift,ui,statesman,token-service,projects-refresh,sidecar)'
1111
required: false
1212
default: ''
1313

@@ -25,12 +25,14 @@ jobs:
2525
statesman_changed: ${{ steps.changes.outputs.statesman }}
2626
token_service_changed: ${{ steps.changes.outputs.token_service }}
2727
projects_refresh_changed: ${{ steps.changes.outputs.projects_refresh }}
28+
sidecar_changed: ${{ steps.changes.outputs.sidecar }}
2829
backend_ee_version: ${{ steps.versions.outputs.backend_ee_version }}
2930
drift_version: ${{ steps.versions.outputs.drift_version }}
3031
ui_version: ${{ steps.versions.outputs.ui_version }}
3132
statesman_version: ${{ steps.versions.outputs.statesman_version }}
3233
token_service_version: ${{ steps.versions.outputs.token_service_version }}
3334
projects_refresh_version: ${{ steps.versions.outputs.projects_refresh_version }}
35+
sidecar_version: ${{ steps.versions.outputs.sidecar_version }}
3436
steps:
3537
- uses: actions/checkout@v4
3638
with:
@@ -49,6 +51,7 @@ jobs:
4951
[[ "$FORCE" == *"statesman"* ]] && echo "statesman=true" >> $GITHUB_OUTPUT || echo "statesman=false" >> $GITHUB_OUTPUT
5052
[[ "$FORCE" == *"token-service"* ]] && echo "token_service=true" >> $GITHUB_OUTPUT || echo "token_service=false" >> $GITHUB_OUTPUT
5153
[[ "$FORCE" == *"projects-refresh"* ]] && echo "projects_refresh=true" >> $GITHUB_OUTPUT || echo "projects_refresh=false" >> $GITHUB_OUTPUT
54+
[[ "$FORCE" == *"sidecar"* ]] && echo "sidecar=true" >> $GITHUB_OUTPUT || echo "sidecar=false" >> $GITHUB_OUTPUT
5255
else
5356
# Auto-detect based on changed files
5457
PREV_COMMIT="${{ github.event.before }}"
@@ -94,6 +97,13 @@ jobs:
9497
else
9598
echo "projects_refresh=false" >> $GITHUB_OUTPUT
9699
fi
100+
101+
# Check sidecar changes
102+
if git diff --name-only $PREV_COMMIT HEAD | grep -E '^(sandbox-sidecar/|\.github/workflows/sidecar-release\.yml)'; then
103+
echo "sidecar=true" >> $GITHUB_OUTPUT
104+
else
105+
echo "sidecar=false" >> $GITHUB_OUTPUT
106+
fi
97107
fi
98108
99109
- name: Calculate new versions
@@ -129,6 +139,7 @@ jobs:
129139
echo "statesman_version=$(get_next_version 'taco/statesman')" >> $GITHUB_OUTPUT
130140
echo "token_service_version=$(get_next_version 'taco/token-service')" >> $GITHUB_OUTPUT
131141
echo "projects_refresh_version=$(get_next_version 'projects-refresh')" >> $GITHUB_OUTPUT
142+
echo "sidecar_version=$(get_next_version 'sandbox-sidecar')" >> $GITHUB_OUTPUT
132143
133144
tag-backend-ee:
134145
needs: detect-changes
@@ -250,6 +261,26 @@ jobs:
250261
251262
echo "Created and pushed tag: $TAG"
252263
264+
tag-sidecar:
265+
needs: detect-changes
266+
if: needs.detect-changes.outputs.sidecar_changed == 'true'
267+
runs-on: ubuntu-latest
268+
steps:
269+
- uses: actions/checkout@v4
270+
with:
271+
token: ${{ secrets.HELM_CHARTS_PAT }}
272+
273+
- name: Create and push tag
274+
run: |
275+
git config user.name "github-actions[bot]"
276+
git config user.email "github-actions[bot]@users.noreply.github.com"
277+
278+
TAG="sandbox-sidecar/${{ needs.detect-changes.outputs.sidecar_version }}"
279+
git tag -a "$TAG" -m "Release sandbox-sidecar ${{ needs.detect-changes.outputs.sidecar_version }}"
280+
git push origin "$TAG"
281+
282+
echo "Created and pushed tag: $TAG"
283+
253284
summary:
254285
needs:
255286
- detect-changes
@@ -259,6 +290,7 @@ jobs:
259290
- tag-statesman
260291
- tag-token-service
261292
- tag-projects-refresh
293+
- tag-sidecar
262294
if: always()
263295
runs-on: ubuntu-latest
264296
steps:
@@ -274,6 +306,7 @@ jobs:
274306
echo "| statesman | ${{ needs.detect-changes.outputs.statesman_changed }} | ${{ needs.detect-changes.outputs.statesman_version }} |" >> $GITHUB_STEP_SUMMARY
275307
echo "| token-service | ${{ needs.detect-changes.outputs.token_service_changed }} | ${{ needs.detect-changes.outputs.token_service_version }} |" >> $GITHUB_STEP_SUMMARY
276308
echo "| projects-refresh | ${{ needs.detect-changes.outputs.projects_refresh_changed }} | ${{ needs.detect-changes.outputs.projects_refresh_version }} |" >> $GITHUB_STEP_SUMMARY
309+
echo "| sidecar | ${{ needs.detect-changes.outputs.sidecar_changed }} | ${{ needs.detect-changes.outputs.sidecar_version }} |" >> $GITHUB_STEP_SUMMARY
277310
echo "" >> $GITHUB_STEP_SUMMARY
278311
echo "Tags have been created and pushed. Build workflows will trigger automatically." >> $GITHUB_STEP_SUMMARY
279312

.github/workflows/backend-ee-release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ jobs:
5959
platforms: linux/amd64,linux/arm64
6060
tags: ${{ steps.docker-meta.outputs.tags }}
6161
labels: ${{ steps.docker-meta.outputs.labels }}
62-
cache-from: type=gha
63-
cache-to: type=gha,mode=max
6462
build-args: |
6563
COMMIT_SHA=${{ github.sha }}
6664
VERSION=${{ steps.meta.outputs.version }}

.github/workflows/drift-release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ jobs:
5959
platforms: linux/amd64,linux/arm64
6060
tags: ${{ steps.docker-meta.outputs.tags }}
6161
labels: ${{ steps.docker-meta.outputs.labels }}
62-
cache-from: type=gha
63-
cache-to: type=gha,mode=max
6462
build-args: |
6563
COMMIT_SHA=${{ github.sha }}
6664
VERSION=${{ steps.meta.outputs.version }}

.github/workflows/projects-refresh-release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ jobs:
4848
type=ref,event=tag
4949
type=raw,value=latest
5050
51-
- name: Build and push Docker image
52-
uses: docker/build-push-action@v5
51+
52+
- uses: depot/setup-action@v1
53+
- name: Build projects-refresh image (no push)
54+
uses: depot/build-push-action@v1
5355
with:
56+
project: p9zgmm1k3n
57+
token: ${{ secrets.DEPOT_TOKEN }}
5458
context: .
5559
file: ./Dockerfile_bg_projects_refresh
5660
push: true
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: projects-refresh-image-build
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- background/projects-refresh-service/**
7+
- Dockerfile_bg_projects_refresh
8+
- .github/workflows/projects_refresh_image_build.yml
9+
workflow_dispatch: {}
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
timeout-minutes: 30
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Set up QEMU
23+
uses: docker/setup-qemu-action@v3
24+
25+
- name: Set up Docker Buildx
26+
uses: docker/setup-buildx-action@v3
27+
28+
- uses: depot/setup-action@v1
29+
- name: Build projects-refresh image (no push)
30+
uses: depot/build-push-action@v1
31+
with:
32+
project: p9zgmm1k3n
33+
token: ${{ secrets.DEPOT_TOKEN }}
34+
context: .
35+
file: Dockerfile_bg_projects_refresh
36+
platforms: linux/amd64,linux/arm64
37+
push: false
38+
tags: ghcr.io/diggerhq/digger/projects-refresh-service:ci-test
39+
build-args: |
40+
COMMIT_SHA=${{ github.sha }}
41+
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: Sidecar Release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'sandbox-sidecar/v*'
7+
8+
env:
9+
REGISTRY: ghcr.io
10+
IMAGE_NAME: diggerhq/sandbox-sidecar
11+
12+
jobs:
13+
build-and-push:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
20+
- name: Derive version
21+
id: meta
22+
run: |
23+
TAG="${GITHUB_REF_NAME}" # e.g. sandbox-sidecar/v0.1.0.0
24+
VERSION="${TAG##*/}" # v0.1.0.0
25+
echo "version=$VERSION" >> $GITHUB_OUTPUT
26+
27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v3
29+
30+
- name: Log in to Container Registry
31+
uses: docker/login-action@v3
32+
with:
33+
registry: ${{ env.REGISTRY }}
34+
username: ${{ github.actor }}
35+
password: ${{ secrets.GITHUB_TOKEN }}
36+
37+
- name: Extract metadata
38+
id: docker-meta
39+
uses: docker/metadata-action@v5
40+
with:
41+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
42+
tags: |
43+
type=raw,value=${{ steps.meta.outputs.version }}
44+
type=ref,event=tag
45+
type=raw,value=latest
46+
47+
- uses: depot/setup-action@v1
48+
- uses: depot/build-push-action@v1
49+
with:
50+
project: 43l6gkbwqm
51+
token: ${{ secrets.DEPOT_TOKEN }}
52+
context: ./sandbox-sidecar
53+
file: ./sandbox-sidecar/Dockerfile_sidecar
54+
push: true
55+
platforms: linux/amd64,linux/arm64
56+
tags: ${{ steps.docker-meta.outputs.tags }}
57+
labels: ${{ steps.docker-meta.outputs.labels }}
58+
build-args: |
59+
COMMIT_SHA=${{ github.sha }}
60+
VERSION=${{ steps.meta.outputs.version }}
61+
62+
create-release:
63+
needs: [build-and-push]
64+
runs-on: ubuntu-latest
65+
steps:
66+
- uses: actions/checkout@v4
67+
with:
68+
fetch-depth: 0
69+
70+
- name: Derive version
71+
id: meta
72+
run: |
73+
TAG="${GITHUB_REF_NAME}" # e.g. sandbox-sidecar/v0.1.0.0
74+
VERSION="${TAG##*/}" # v0.1.0.0
75+
echo "version=$VERSION" >> $GITHUB_OUTPUT
76+
77+
- name: Create GitHub Release
78+
uses: softprops/action-gh-release@v1
79+
with:
80+
tag_name: ${{ github.ref_name }}
81+
name: Sandbox Sidecar ${{ steps.meta.outputs.version }}
82+
body: |
83+
## Sandbox Sidecar ${{ steps.meta.outputs.version }}
84+
85+
Node.js service for managing E2B sandboxes for remote Terraform/OpenTofu execution.
86+
87+
### Docker Image
88+
```bash
89+
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
90+
```
91+
92+
draft: false
93+
prerelease: false
94+

0 commit comments

Comments
 (0)