From bd59016b1d726245cb32fc8cd53311a73441a2ee Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Dec 2020 17:51:49 +0100 Subject: [PATCH 1/6] Add check python version --- .github/check_version.py | 22 ++++++++++------------ .github/workflows/version-check.yml | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/version-check.yml diff --git a/.github/check_version.py b/.github/check_version.py index b9e9b2825a..8b5fd90a0a 100644 --- a/.github/check_version.py +++ b/.github/check_version.py @@ -9,18 +9,16 @@ VERSION_FILE = 'medusa/common.py' VERSION_LINE_REGEXP = re.compile(r"VERSION = '([0-9.]+)'") -TRAVIS = os.environ.get('TRAVIS', False) - -if TRAVIS: - TRAVIS_PULL_REQUEST = os.environ['TRAVIS_PULL_REQUEST'] # 'false' if not a PR, otherwise - the PR number - TRAVIS_PR_TARGET_BRANCH = os.environ['TRAVIS_BRANCH'] - TRAVIS_PR_SOURCE_BRANCH = os.environ['TRAVIS_PULL_REQUEST_BRANCH'] - TRAVIS_BUILD_DIR = os.environ['TRAVIS_BUILD_DIR'] -else: - TRAVIS_PULL_REQUEST = '1234' - TRAVIS_PR_TARGET_BRANCH = 'master' - TRAVIS_PR_SOURCE_BRANCH = 'develop' # or 'release/release-0.2.3' - TRAVIS_BUILD_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) + +TRAVIS_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME'] # 'false' if not a PR, otherwise - the PR number +TRAVIS_PR_TARGET_BRANCH = os.environ['GITHUB_BASE_REF'] +TRAVIS_PR_SOURCE_BRANCH = os.environ['GITHUB_REF'] +TRAVIS_BUILD_DIR = os.environ['GITHUB_WORKSPACE'] + +print(TRAVIS_PULL_REQUEST) +print(TRAVIS_PR_TARGET_BRANCH) +print(TRAVIS_PR_SOURCE_BRANCH) +print(TRAVIS_BUILD_DIR) TRAVIS_PR_TARGET_BRANCH = TRAVIS_PR_TARGET_BRANCH.lower() TRAVIS_PR_SOURCE_BRANCH = TRAVIS_PR_SOURCE_BRANCH.lower() diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml new file mode 100644 index 0000000000..786c9b3a53 --- /dev/null +++ b/.github/workflows/version-check.yml @@ -0,0 +1,18 @@ +name: Check app version + +on: [pull_request] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.7] + + steps: + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Check version + run: python ./check_version.py From a09d507124bdc9a57ccda881f17b6e8e97b9887c Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Dec 2020 17:54:56 +0100 Subject: [PATCH 2/6] ok --- .github/workflows/version-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index 786c9b3a53..0d41ea8b1f 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -15,4 +15,4 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Check version - run: python ./check_version.py + run: python check_version.py From f9fc5f312b41053f5917648ca1c69042c49e20b1 Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Dec 2020 17:56:42 +0100 Subject: [PATCH 3/6] sure --- .github/workflows/version-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index 0d41ea8b1f..7aa8794f67 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -15,4 +15,4 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Check version - run: python check_version.py + run: python ./.github/check_version.py From ec919fa65a2d906da572fdec9b75fc6ad966932c Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Dec 2020 18:01:50 +0100 Subject: [PATCH 4/6] check it out --- .github/workflows/version-check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index 7aa8794f67..9d5b481fd5 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -10,6 +10,7 @@ jobs: python-version: [3.7] steps: + - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From ac683f57083294e66133a798babf2db6cce05ef9 Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Dec 2020 18:08:16 +0100 Subject: [PATCH 5/6] goog --- .github/check_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/check_version.py b/.github/check_version.py index 8b5fd90a0a..08ca024c59 100644 --- a/.github/check_version.py +++ b/.github/check_version.py @@ -10,9 +10,9 @@ VERSION_FILE = 'medusa/common.py' VERSION_LINE_REGEXP = re.compile(r"VERSION = '([0-9.]+)'") -TRAVIS_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME'] # 'false' if not a PR, otherwise - the PR number +TRAVIS_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME'] TRAVIS_PR_TARGET_BRANCH = os.environ['GITHUB_BASE_REF'] -TRAVIS_PR_SOURCE_BRANCH = os.environ['GITHUB_REF'] +TRAVIS_PR_SOURCE_BRANCH = os.environ['GITHUB_HEAD_REF'] TRAVIS_BUILD_DIR = os.environ['GITHUB_WORKSPACE'] print(TRAVIS_PULL_REQUEST) @@ -71,7 +71,7 @@ def search_file_for_version(): # Are we merging either develop or a release branch into master in a pull request? if all(( - TRAVIS_PULL_REQUEST != 'false', + TRAVIS_PULL_REQUEST == 'pull_request', TRAVIS_PR_TARGET_BRANCH == 'master', TRAVIS_PR_SOURCE_BRANCH == 'develop' or TRAVIS_PR_SOURCE_BRANCH.startswith('release/') )): From 5e5702f43ff2c666898b20df13306872c2646c3b Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 16 Dec 2020 18:11:47 +0100 Subject: [PATCH 6/6] travis -> gh --- .github/check_version.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/check_version.py b/.github/check_version.py index 08ca024c59..c2990213d0 100644 --- a/.github/check_version.py +++ b/.github/check_version.py @@ -10,18 +10,13 @@ VERSION_FILE = 'medusa/common.py' VERSION_LINE_REGEXP = re.compile(r"VERSION = '([0-9.]+)'") -TRAVIS_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME'] -TRAVIS_PR_TARGET_BRANCH = os.environ['GITHUB_BASE_REF'] -TRAVIS_PR_SOURCE_BRANCH = os.environ['GITHUB_HEAD_REF'] -TRAVIS_BUILD_DIR = os.environ['GITHUB_WORKSPACE'] +GH_PULL_REQUEST = os.environ['GITHUB_EVENT_NAME'] +GH_PR_TARGET_BRANCH = os.environ['GITHUB_BASE_REF'] +GH_PR_SOURCE_BRANCH = os.environ['GITHUB_HEAD_REF'] +GH_BUILD_DIR = os.environ['GITHUB_WORKSPACE'] -print(TRAVIS_PULL_REQUEST) -print(TRAVIS_PR_TARGET_BRANCH) -print(TRAVIS_PR_SOURCE_BRANCH) -print(TRAVIS_BUILD_DIR) - -TRAVIS_PR_TARGET_BRANCH = TRAVIS_PR_TARGET_BRANCH.lower() -TRAVIS_PR_SOURCE_BRANCH = TRAVIS_PR_SOURCE_BRANCH.lower() +GH_PR_TARGET_BRANCH = GH_PR_TARGET_BRANCH.lower() +GH_PR_SOURCE_BRANCH = GH_PR_SOURCE_BRANCH.lower() class Version(object): @@ -59,7 +54,7 @@ def __repr__(self): def search_file_for_version(): """Get the app version from the code.""" version_file = VERSION_FILE.split('/') - filename = os.path.abspath(os.path.join(TRAVIS_BUILD_DIR, *version_file)) + filename = os.path.abspath(os.path.join(GH_BUILD_DIR, *version_file)) with io.open(filename, 'r', encoding='utf-8') as fh: for line in fh: match = VERSION_LINE_REGEXP.match(line) @@ -71,9 +66,9 @@ def search_file_for_version(): # Are we merging either develop or a release branch into master in a pull request? if all(( - TRAVIS_PULL_REQUEST == 'pull_request', - TRAVIS_PR_TARGET_BRANCH == 'master', - TRAVIS_PR_SOURCE_BRANCH == 'develop' or TRAVIS_PR_SOURCE_BRANCH.startswith('release/') + GH_PULL_REQUEST == 'pull_request', + GH_PR_TARGET_BRANCH == 'master', + GH_PR_SOURCE_BRANCH == 'develop' or GH_PR_SOURCE_BRANCH.startswith('release/') )): # Get lastest git tag on master branch proc = subprocess.call(['git', 'fetch', 'origin', 'master:master'])