Monorepo for Aesthetic.Computer
aesthetic.computer
chore: point oven native mirror at tangled
+17
-5
+15
-3
oven/deploy.sh
+15
-3
oven/deploy.sh
···
7
7
OVEN_HOST="137.184.237.166"
8
8
SSH_KEY="${SSH_KEY:-$(dirname "$0")/../aesthetic-computer-vault/oven/ssh/oven-deploy-key}"
9
9
REMOTE_DIR="/opt/oven"
10
+
NATIVE_GIT_FETCH_URL="${NATIVE_GIT_FETCH_URL:-https://tangled.org/aesthetic.computer/core.git}"
10
11
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
11
12
AC_SOURCE="$SCRIPT_DIR/../system/public/aesthetic.computer"
12
13
FEDAC_SOURCE="$SCRIPT_DIR/../fedac"
···
222
223
# Set up native git repo for auto-polling OTA builds
223
224
echo ""
224
225
echo "📦 Setting up native git repo for OTA auto-builds..."
226
+
echo " Fetch remote: $NATIVE_GIT_FETCH_URL"
225
227
ssh -i "$SSH_KEY" -o StrictHostKeyChecking=no "root@$OVEN_HOST" "
228
+
set -euo pipefail
226
229
NATIVE_GIT_DIR=/opt/oven/native-git
230
+
NATIVE_GIT_FETCH_URL='$NATIVE_GIT_FETCH_URL'
227
231
if [ ! -d \$NATIVE_GIT_DIR/.git ]; then
228
232
echo ' Cloning repo (first time)...'
229
-
git clone --branch main --single-branch https://github.com/whistlegraph/aesthetic-computer.git \$NATIVE_GIT_DIR
233
+
git clone --branch main --single-branch \$NATIVE_GIT_FETCH_URL \$NATIVE_GIT_DIR
230
234
else
231
235
echo ' Git repo exists, fetching latest...'
232
-
cd \$NATIVE_GIT_DIR && git fetch origin main --quiet && git merge origin/main --ff-only --quiet || true
236
+
cd \$NATIVE_GIT_DIR
237
+
git remote set-url origin \$NATIVE_GIT_FETCH_URL
238
+
git fetch origin main --quiet || true
239
+
git branch --set-upstream-to=origin/main main >/dev/null 2>&1 || true
240
+
if git rev-parse --verify origin/main >/dev/null 2>&1 && git merge-base --is-ancestor HEAD origin/main; then
241
+
git merge origin/main --ff-only --quiet || true
242
+
else
243
+
echo ' Repo has local commits or divergence; leaving checkout as-is (native build preflight will hard-sync to origin/main).'
244
+
fi
233
245
fi
234
246
if id -u oven >/dev/null 2>&1; then
235
247
chown -R oven:oven \$NATIVE_GIT_DIR
···
248
260
OVEN_GH_TOKEN=\$(grep '^OVEN_GH_TOKEN=' $REMOTE_DIR/.env 2>/dev/null | cut -d= -f2-)
249
261
if [ -n \"\$OVEN_GH_TOKEN\" ]; then
250
262
cd \$NATIVE_GIT_DIR
251
-
# Set push URL with token authentication (fetch stays anonymous HTTPS)
263
+
# Keep fetch on Tangled, but push papers auto-build commits to the GitHub mirror.
252
264
git remote set-url --push origin https://x-access-token:\${OVEN_GH_TOKEN}@github.com/whistlegraph/aesthetic-computer.git
253
265
echo ' Push URL configured with token auth'
254
266
else
+2
-2
oven/native-git-poller.mjs
+2
-2
oven/native-git-poller.mjs
···
1
1
// native-git-poller.mjs — polls git for fedac/native/ changes, auto-triggers OTA builds
2
2
//
3
3
// Runs inside the oven server. Every POLL_INTERVAL_MS (default 60s), fetches
4
-
// origin/main and checks if any fedac/native/ paths changed since the last
4
+
// origin/main from the configured native checkout remote and checks if any fedac/native/ paths changed since the last
5
5
// successful build. If so, pulls and triggers startNativeBuild().
6
6
//
7
7
// Requires a git clone at GIT_REPO_DIR (default /opt/oven/native-git/).
···
175
175
logFn(
176
176
"error",
177
177
"⚠️",
178
-
`Native git poller disabled — repo dir not found: ${GIT_REPO_DIR}. Run: git clone --branch main https://github.com/whistlegraph/aesthetic-computer.git ${GIT_REPO_DIR}`
178
+
`Native git poller disabled — repo dir not found: ${GIT_REPO_DIR}. Run: git clone --branch main https://tangled.org/aesthetic.computer/core.git ${GIT_REPO_DIR}`
179
179
);
180
180
});
181
181
}