From 0f97c34204153e986d5fb8033de31fb2fb9f45fc Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 22 Dec 2021 11:18:11 +0200 Subject: [PATCH] Revert "Add .github/workflows/check-based-on-master (#1991)" This reverts commit 06cf4e0f707718176acd72f894816f5ff86ac36c. This break merge requests to non-master branches - see https://github.com/VictoriaMetrics/VictoriaMetrics/pull/1993#issuecomment-999403963 --- .github/workflows/check-based-on-master.sh | 12 ------------ .github/workflows/check-based-on-master.yml | 18 ------------------ 2 files changed, 30 deletions(-) delete mode 100755 .github/workflows/check-based-on-master.sh delete mode 100644 .github/workflows/check-based-on-master.yml diff --git a/.github/workflows/check-based-on-master.sh b/.github/workflows/check-based-on-master.sh deleted file mode 100755 index b95c1334f..000000000 --- a/.github/workflows/check-based-on-master.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -x -e -MASTER_ID=$(git rev-parse "origin/master") -CURRENT_ID=$(git rev-parse "HEAD") -BASED_ON_ID=$(git merge-base "$CURRENT_ID" "$MASTER_ID") - -if [[ "$MASTER_ID" != "$BASED_ON_ID" ]] -then - echo "Current branch is based on $BASED_ON_ID, which is not the latest \`master\`: $MASTER_ID. Consider \`git rebase origin/master\`." - exit 1 -fi diff --git a/.github/workflows/check-based-on-master.yml b/.github/workflows/check-based-on-master.yml deleted file mode 100644 index 3175bb83b..000000000 --- a/.github/workflows/check-based-on-master.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: check-based-on-master -on: - pull_request: - push: - branches: [ master ] -jobs: - hook: - name: Check whether this branch is based on master branch - runs-on: ubuntu-latest - steps: - - name: Check out repo @ current branch - uses: actions/checkout@v2 - with: - fetch-depth: 1000 # Hopefully current branch is less than 1000 commits from main - - name: Fetch origin/master - run: "git fetch origin master" - - name: Run check-based-on-master - run: .github/workflows/check-based-on-master.sh