From e8b04c63d373c363ff06f066ad114be5a3ba2828 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 22 Sep 2025 15:34:10 -0400 Subject: [PATCH] Removing custom script and workflow for OVOS updates. --- .gitea/workflows/ovos-compose-upstream.yml | 29 -------------- update-sync-ovos-compose.sh | 46 ---------------------- 2 files changed, 75 deletions(-) delete mode 100644 .gitea/workflows/ovos-compose-upstream.yml delete mode 100755 update-sync-ovos-compose.sh diff --git a/.gitea/workflows/ovos-compose-upstream.yml b/.gitea/workflows/ovos-compose-upstream.yml deleted file mode 100644 index da75970..0000000 --- a/.gitea/workflows/ovos-compose-upstream.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Sync Compose Directory - -on: - schedule: - # Runs at 2:00 UTC every day; adjust as needed - - cron: "0 2 * * *" - workflow_dispatch: # allows manual trigger - -jobs: - sync-compose: - runs-on: ubuntu-latest - steps: - # Step 1: Checkout the repo - - name: Checkout benedikta-ovos - uses: actions/checkout@v3 - - - name: Sync compose from ovos-docker - run: | - # Make the sync script executable - chmod +x ./update-sync-ovos-compose.sh - # Run the script - ./update-sync-ovos-compose.sh - - - name: Commit & push changes - uses: EndBug/add-and-commit@v9 - with: - add: "compose" - message: "Update compose/ from ovos-docker:dev" - push: true diff --git a/update-sync-ovos-compose.sh b/update-sync-ovos-compose.sh deleted file mode 100755 index 8b2ff45..0000000 --- a/update-sync-ovos-compose.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Config -OVOS_DOCKER_DIR="../ovos-docker" -OVOS_REMOTE="ovos-docker-local" -SPLIT_BRANCH="compose-split" -PREFIX="compose" - -# Clone ovos-docker if missing -if [ ! -d "$OVOS_DOCKER_DIR/.git" ]; then - echo "Cloning ovos-docker..." - git clone https://github.com/OpenVoiceOS/ovos-docker.git "$OVOS_DOCKER_DIR" -fi - -# Update ovos-docker -echo "Updating ovos-docker..." -cd "$OVOS_DOCKER_DIR" -git fetch origin -git checkout dev -git pull origin dev - -# Create split branch -echo "Splitting compose/ directory..." -git branch -D "$SPLIT_BRANCH" 2>/dev/null || true -git subtree split --prefix=$PREFIX origin/dev -b "$SPLIT_BRANCH" - -# Go back to benedikta-ovos -cd - >/dev/null - -# Add remote if not exists -if ! git remote | grep -q "$OVOS_REMOTE"; then - git remote add "$OVOS_REMOTE" "$OVOS_DOCKER_DIR" -fi -git fetch "$OVOS_REMOTE" - -# Check if compose/ already exists in benedikta-ovos -if [ ! -d "$PREFIX" ]; then - echo "Adding compose/ for the first time..." - git subtree add --prefix=$PREFIX "$OVOS_REMOTE" "$SPLIT_BRANCH" --squash -else - echo "Updating existing compose/ directory..." - git subtree pull --prefix=$PREFIX "$OVOS_REMOTE" "$SPLIT_BRANCH" --squash -fi - -echo "✅ compose/ is synced with ovos-docker:dev"