From bef027fc07c4cbed07401db962283e55c2a8c1ab Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Sun, 26 May 2024 01:46:04 +0200 Subject: [PATCH] [CI/CD] Just remove the sync-stable-branch step. --- .drone.yml | 23 ----------------------- .drone/sync-stable-branch.sh | 19 ------------------- 2 files changed, 42 deletions(-) delete mode 100755 .drone/sync-stable-branch.sh diff --git a/.drone.yml b/.drone.yml index bf048d47b9..336058f67d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,29 +29,6 @@ steps: commands: - . .drone/github-mirror.sh -### -### Synchronize the `stable` branch to the new release -### - -- name: sync-stable-branch - image: alpine - environment: - SSH_PUBKEY: - from_secret: ssh_pubkey - SSH_PRIVKEY: - from_secret: ssh_privkey - PGP_KEY: - from_secret: pgp_key - PGP_KEY_ID: - from_secret: pgp_key_id - - commands: - - . .drone/sync-stable-branch.sh - - when: - event: - - tag - ### ### Rebuild the docs ### diff --git a/.drone/sync-stable-branch.sh b/.drone/sync-stable-branch.sh deleted file mode 100755 index 7245652d0f..0000000000 --- a/.drone/sync-stable-branch.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -. .drone/macros/configure-git.sh -. .drone/macros/configure-ssh.sh -. .drone/macros/configure-gpg.sh - -# Git configuration -git remote rm origin -git remote add origin git@git.platypush.tech:platypush/platypush.git -git fetch origin - -# Merge and push to the `stable` branch -git checkout stable || git checkout -b stable -git rebase master -git push -u origin stable -git checkout master - -# Restore the original git configuration -mv "$TMP_GIT_CONF" "$GIT_CONF"