diff --git a/.github/workflows/hotfix-cherry-pick.yml b/.github/workflows/hotfix-cherry-pick.yml deleted file mode 100644 index e41adefcd7..0000000000 --- a/.github/workflows/hotfix-cherry-pick.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Hotfix Cherry-Pick - -on: - pull_request_target: - types: [closed, labeled] - -concurrency: - group: hotfix-to-main - cancel-in-progress: false - -jobs: - cherry-pick: - if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'hotfix') - runs-on: ubuntu-24.04 - permissions: - contents: write - steps: - - name: Checkout main - uses: actions/checkout@v7 - with: - ref: main - fetch-depth: 0 - token: ${{ secrets.HOTFIX_PUSH_TOKEN }} - - - name: Cherry-pick fix to main - env: - MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }} - run: | - git config user.name "Dokploy Bot" - git config user.email "bot@dokploy.com" - SHA="$MERGE_SHA" - if [ "$(git rev-list --parents -n1 "$SHA" | wc -w)" -gt 2 ]; then - git cherry-pick -x -m 1 "$SHA" - else - git cherry-pick -x "$SHA" - fi - git commit --amend -m "$(git log -1 --format=%B)" -m "[skip ci]" - git push origin main - - - name: Sync cherry-pick back into canary - run: | - git config user.name "Dokploy Bot" - git config user.email "bot@dokploy.com" - git fetch origin canary main - git checkout -B canary origin/canary - if ! git merge origin/main -m "chore: sync hotfix from main into canary [skip ci]"; then - git merge --abort - echo "::error::Could not auto-sync the hotfix into canary (real conflict, not just history divergence). Merge main into canary manually to avoid a conflict on the next release PR." - exit 1 - fi - git push origin canary diff --git a/.github/workflows/hotfix-release.yml b/.github/workflows/hotfix-release.yml deleted file mode 100644 index 3271df861e..0000000000 --- a/.github/workflows/hotfix-release.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Hotfix Release - -on: - workflow_dispatch: - -concurrency: - group: hotfix-to-main - cancel-in-progress: false - -# Push to main goes through HOTFIX_PUSH_TOKEN, not the workflow token. -permissions: - contents: read - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout main - uses: actions/checkout@v7 - with: - ref: main - token: ${{ secrets.HOTFIX_PUSH_TOKEN }} - - - name: Bump patch version and push - run: | - git config user.name "Dokploy Bot" - git config user.email "bot@dokploy.com" - CURRENT=$(node -p "require('./apps/dokploy/package.json').version") - NEW=$(echo "$CURRENT" | awk -F. -v OFS=. '{$NF++; print}') - sed -i "s/\"version\": \"$CURRENT\"/\"version\": \"$NEW\"/" apps/dokploy/package.json - git commit -am "chore: release ${NEW}" - git push origin main