Skip to content

Commit c29d8b6

Browse files
committed
Merge remote-tracking branch 'origin/main' into issue-239
# Conflicts: # packages/app/src/web/actions.ts # packages/app/src/web/app-ready-controller.ts # packages/app/src/web/app-ready-terminal-screen.tsx # packages/app/src/web/panel-terminal.tsx
2 parents 1a5bdbc + 0acfd65 commit c29d8b6

28 files changed

Lines changed: 369 additions & 41 deletions

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"changelog": [
44
"@changesets/changelog-github",
55
{
6-
"repo": "<PLACEHOLDER>"
6+
"repo": "ProverCoderAI/docker-git"
77
}
88
],
99
"commit": false,

.changeset/tidy-session-sync-tool.md

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

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
e2e-runtime-volumes-ssh:
192192
name: E2E (Runtime volumes + SSH)
193193
runs-on: ubuntu-latest
194-
timeout-minutes: 40
194+
timeout-minutes: 60
195195
steps:
196196
- uses: actions/checkout@v6
197197
- name: Install dependencies

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ jobs:
240240
- name: Version packages
241241
if: steps.compare_npm.outputs.should_release != 'false' && github.actor != 'github-actions[bot]'
242242
shell: bash
243+
env:
244+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
243245
run: |
244246
set -euo pipefail
245247
bun run changeset-version
89.8 KB
Loading
30 KB
Loading

packages/api/src/http.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import {
6969
} from "./services/federation.js"
7070
import {
7171
applyAllProjects,
72+
applyProjectById,
7273
createProjectFromRequest,
7374
deleteProjectById,
7475
downAllProjects,
@@ -972,6 +973,14 @@ export const makeRouter = () => {
972973
Effect.catchAll(errorResponse)
973974
)
974975
),
976+
HttpRouter.post(
977+
"/projects/:projectId/apply",
978+
projectParams.pipe(
979+
Effect.flatMap(({ projectId }) => applyProjectById(projectId)),
980+
Effect.flatMap((project) => jsonResponse({ ok: true, project }, 200)),
981+
Effect.catchAll(errorResponse)
982+
)
983+
),
975984
HttpRouter.post(
976985
"/projects/:projectId/down",
977986
projectParams.pipe(

packages/api/src/services/projects.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
type AppError,
3+
applyProjectConfig,
34
buildCreateCommand,
45
defaultTemplateConfig,
56
createProject,
@@ -588,6 +589,28 @@ export const applyAllProjects = (activeOnly: boolean) =>
588589
activeOnly
589590
})
590591

592+
export const applyProjectById = (
593+
projectId: string
594+
) =>
595+
Effect.gen(function*(_) {
596+
const project = yield* _(findProjectById(projectId))
597+
yield* _(markDeployment(projectId, "apply", "docker-git apply"))
598+
yield* _(
599+
runWithProjectEventLogs(
600+
projectId,
601+
applyProjectConfig({
602+
_tag: "Apply",
603+
projectDir: project.projectDir,
604+
runUp: true
605+
})
606+
)
607+
)
608+
const details = yield* _(runtimeProjectDetails(project))
609+
yield* _(recordProjectStartedFromDetails(project, details, "up"))
610+
yield* _(markDeployment(projectId, "running", "Apply completed"))
611+
return details
612+
}).pipe(Effect.mapError(toProjectApiError))
613+
591614
export const downAllProjects = () => downAllDockerGitProjects
592615

593616
export const getProject = (

packages/app/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @prover-coder-ai/docker-git
22

3+
## 1.0.82
4+
5+
### Patch Changes
6+
7+
- [#231](https://github.com/ProverCoderAI/docker-git/pull/231) [`babbf8d`](https://github.com/ProverCoderAI/docker-git/commit/babbf8db693d49c6e35996934658097dc305ba8b) Thanks [@skulidropek](https://github.com/skulidropek)! - Publish docker-git-session-sync as a public npm CLI and install it for post-push session backup comments, with a local Docker build fallback before first publish.
8+
9+
- Updated dependencies [[`babbf8d`](https://github.com/ProverCoderAI/docker-git/commit/babbf8db693d49c6e35996934658097dc305ba8b)]:
10+
- @prover-coder-ai/docker-git-session-sync@1.0.1
11+
312
## 1.0.81
413

514
### Patch Changes

packages/app/eslint.config.mts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,36 @@ export default defineConfig(
279279
}]
280280
}
281281
},
282+
{
283+
files: [
284+
"src/docker-git/menu-create-shared.ts",
285+
"src/docker-git/menu-render.ts",
286+
"src/web/actions-projects.ts",
287+
"src/web/app-ready-controller.ts",
288+
"src/web/app-ready-main-panels.tsx",
289+
"src/web/app-ready-ssh-link-hook.ts",
290+
"src/web/app-ready-terminal-screen.tsx",
291+
"src/web/app-ready-url.ts",
292+
"src/web/panel-content.tsx",
293+
"src/web/panel-create-select.tsx",
294+
"src/web/panel-project-details.tsx",
295+
"src/web/panel-terminal.tsx",
296+
"src/web/terminal-mobile-controls.ts",
297+
"src/web/terminal-panel-runtime-core.ts"
298+
],
299+
rules: {
300+
"complexity": ["error", 15],
301+
"max-lines": [
302+
"error",
303+
{ max: 650, skipBlankLines: true, skipComments: true }
304+
],
305+
"max-lines-per-function": [
306+
"error",
307+
{ max: 160, skipBlankLines: true, skipComments: true }
308+
],
309+
"max-params": ["error", 6]
310+
}
311+
},
282312
{
283313
files: ['**/*.{test,spec}.{ts,tsx}', 'tests/**', '**/__tests__/**'],
284314
...vitest.configs.all,

0 commit comments

Comments
 (0)