From 10f3facc63b781b89eae0e292333278ff1f602e9 Mon Sep 17 00:00:00 2001 From: Spitap Date: Sat, 22 Apr 2023 19:50:48 +0200 Subject: [PATCH] better job handling --- .github/workflows/modoboa.yml | 2 -- modoboa/version.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/modoboa.yml b/.github/workflows/modoboa.yml index 393d77d34..7422e1eec 100644 --- a/.github/workflows/modoboa.yml +++ b/.github/workflows/modoboa.yml @@ -174,8 +174,6 @@ jobs: yarn build cd .. - name: Build packages - env: - IS_RELEASE: yes run: | sudo apt-get install librrd-dev rrdtool libssl-dev python -m pip install --upgrade pip build diff --git a/modoboa/version.py b/modoboa/version.py index 5ab368c65..09e8459f7 100644 --- a/modoboa/version.py +++ b/modoboa/version.py @@ -8,8 +8,8 @@ def local_scheme(version): def get_version(): from setuptools_scm import get_version as default_version github_version = os.environ.get('GITHUB_REF_NAME', None) - is_release = os.environ.get('IS_RELEASE', None) - if is_release is not None and github_version is not None: + github_type = os.environ.get('GITHUB_REF_TYPE', None) + if github_version is not None and github_type == "tag": print(f"GITHUB_REF_NAME found, using version: {github_version}") return github_version return default_version(local_scheme=local_scheme)