Skip to content

chore: sync changes #3523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sitole wants to merge 1 commit into from
Closed

chore: sync changes #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/actions/start-services/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ inputs:
description: "Disable memfd-backed guest memory (on by default)"
required: false
default: "false"
orchestrator-make-path:
description: |
Directory whose Makefile starts the orchestrator (run-debug target).
Lets callers substitute a compatible orchestrator build from a
different directory.
required: false
default: "packages/orchestrator"

runs:
using: "composite"
Expand Down Expand Up @@ -110,6 +117,7 @@ runs:
COMPRESS_FRAME_ENCODE_WORKERS: ${{ inputs.compress_workers }}
TESTS_MEMFILE_DIFF_DEDUP_MODE: ${{ inputs.dedup_mode }}
TESTS_DISABLE_MEMFD: ${{ inputs.disable_memfd }}
ORCHESTRATOR_MAKE_PATH: ${{ inputs.orchestrator-make-path }}
E2B_DEBUG: "true"
run: |
mkdir -p $SHARED_CHUNK_CACHE_PATH
Expand All @@ -134,7 +142,7 @@ runs:


echo "Start orchestrator"
./scripts/start-service.sh "Orchestrator" packages/orchestrator run-debug ~/logs/orchestrator.log http://localhost:5008/health
./scripts/start-service.sh "Orchestrator" "${ORCHESTRATOR_MAKE_PATH}" run-debug ~/logs/orchestrator.log http://localhost:5008/health

echo "Start API"
STARTUP_TIMEOUT=60 ./scripts/start-service.sh "API" packages/api run ~/logs/api.log http://localhost:3000/health
Expand Down
3 changes: 3 additions & 0 deletions packages/local-dev/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
clickhouse-config-generated.xml

# Remove go build binary
/local-dev
Binary file removed packages/local-dev/local-dev
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions scripts/get-latest-migration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#!/bin/bash
set -euo pipefail

cd "$(git rev-parse --show-toplevel)"
# Read the migrations from the filesystem, not from git: this script also
# runs where git metadata is absent or points at a different tree (docker
# build contexts, CI workspaces assembled from a subdirectory).
cd "$(dirname "$0")/.."

latest_version=$(git ls-tree --name-only HEAD -- packages/db/migrations/ | sed 's|.*/||' | sed 's/_.*//' | sort | tail -n 1)
echo "$latest_version"
latest_version=$(ls packages/db/migrations/ | sed 's/_.*//' | sort | tail -n 1)
echo "$latest_version"
Loading