Skip to content

Commit d6864bc

Browse files
Merge remote-tracking branch 'origin/main' into fix/stop-not-stopping
2 parents d31c276 + d53a403 commit d6864bc

File tree

6 files changed

+184
-113
lines changed

6 files changed

+184
-113
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
env:
1313
ETFS_PROJECT_NAME: ci
1414
APP_IMAGE: ghcr.io/${{ github.repository }}/app:ci
15+
CACHE_REF: ghcr.io/${{ github.repository }}/app:buildcache
1516

1617
jobs:
1718
build-app-image:
@@ -37,8 +38,12 @@ jobs:
3738
file: docker/app/Dockerfile
3839
push: true
3940
tags: ${{ env.APP_IMAGE }}
40-
cache-from: type=gha
41-
cache-to: type=gha,mode=max
41+
cache-from: |
42+
type=gha
43+
type=registry,ref=${{ env.CACHE_REF }}
44+
cache-to: |
45+
type=gha,mode=max
46+
type=registry,ref=${{ env.CACHE_REF }},mode=max
4247
4348
build-frontend:
4449
name: Frontend build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public/workspaces/*
5555
# E2E Playwright (tests/End2End)
5656
/tests/End2End/playwright-report/
5757
/tests/End2End/test-results/
58+
/test-results/
5859

5960
# Generated conversation log viewer files (in project root)
6061
/conversation-log-*.html

0 commit comments

Comments
 (0)