Skip to content

Commit 76e949d

Browse files
committed
.github/workflows: Remove merge-stable from integration
Remove the merge-stable rule from integration.yaml to prevent automatically merging patches from staging into stable. The rationale is that right now that tests are still not comprehensive, and it's still unclear how to correctly handle large feature sets that consist of multiple PRs. Signed-off-by: Michalis Pappas <michalis@unikraft.io>
1 parent 2dd7b2b commit 76e949d

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

.github/workflows/integration.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,3 @@ jobs:
9494
exit 1;
9595
env:
9696
GITHUB_TOKEN: ${{ secrets.GH_CATALOG_PAT }}
97-
98-
99-
merge-stable:
100-
needs: [catalog-tests]
101-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/staging' && github.repository_owner == 'unikraft' }}
102-
runs-on: ubuntu-latest
103-
steps:
104-
- uses: actions/checkout@v4
105-
with:
106-
fetch-depth: 0
107-
ref: staging
108-
109-
- name: Merge stable
110-
run: |
111-
set -e;
112-
113-
git pull origin stable;
114-
git checkout --track origin/stable;
115-
git rebase staging;
116-
git push origin stable;

0 commit comments

Comments
 (0)