From a2609ef803035ad6fe9a608bb98c940af7b94c61 Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 17:15:30 +0000 Subject: [PATCH 01/12] Patch version for python friendly + git commit --- .github/workflows/python.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 653964a..b152d53 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -53,6 +53,11 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Replace BERGAMOT_VERSION with python friendly name + run: | + SHA256SHORT=$(git rev-parse --short HEAD) + cat BERGAMOT_VERSION | sed 's/^v//g' / sed "s/$/+${SHA256SHORT}" > BERGAMOT_VERSION + cat BERGAMOT_VERSION - name: Install Dependencies run: |- From b022644581482bcf794273c5982612089ed66a28 Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 17:20:19 +0000 Subject: [PATCH 02/12] pipe properly --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b152d53..bfb46b0 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -56,7 +56,7 @@ jobs: - name: Replace BERGAMOT_VERSION with python friendly name run: | SHA256SHORT=$(git rev-parse --short HEAD) - cat BERGAMOT_VERSION | sed 's/^v//g' / sed "s/$/+${SHA256SHORT}" > BERGAMOT_VERSION + cat BERGAMOT_VERSION | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}" > BERGAMOT_VERSION cat BERGAMOT_VERSION - name: Install Dependencies From 4f9781fb39bbbffbda144dd942f9da09237b55ff Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 17:23:32 +0000 Subject: [PATCH 03/12] More fixes --- .github/workflows/python.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index bfb46b0..18ab419 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -53,11 +53,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Replace BERGAMOT_VERSION with python friendly name + - name: Replace lemonade.version with python friendly name run: | SHA256SHORT=$(git rev-parse --short HEAD) - cat BERGAMOT_VERSION | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}" > BERGAMOT_VERSION - cat BERGAMOT_VERSION + cat lemonade.version | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}/" > lemonade.version + cat lemonade.version - name: Install Dependencies run: |- From f2c1eb8b03d0bfc016f9677faf9bbdd16526875b Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 17:25:38 +0000 Subject: [PATCH 04/12] Run version replacement only if main --- .github/workflows/python.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 18ab419..691deee 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -54,6 +54,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Replace lemonade.version with python friendly name + if: github.ref == 'refs/heads/main' run: | SHA256SHORT=$(git rev-parse --short HEAD) cat lemonade.version | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}/" > lemonade.version From f49710fd45316a5a304c7ae5a5799d0aece0eb59 Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 17:26:55 +0000 Subject: [PATCH 05/12] Revert github workflow changes --- .github/workflows/python.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 691deee..653964a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -53,12 +53,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Replace lemonade.version with python friendly name - if: github.ref == 'refs/heads/main' - run: | - SHA256SHORT=$(git rev-parse --short HEAD) - cat lemonade.version | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}/" > lemonade.version - cat lemonade.version - name: Install Dependencies run: |- From 013dc7745abca5b56be0994c65d8573d57659b61 Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:06:32 +0000 Subject: [PATCH 06/12] Revert "Revert github workflow changes" This reverts commit f49710fd45316a5a304c7ae5a5799d0aece0eb59. --- .github/workflows/python.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 653964a..691deee 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -53,6 +53,12 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Replace lemonade.version with python friendly name + if: github.ref == 'refs/heads/main' + run: | + SHA256SHORT=$(git rev-parse --short HEAD) + cat lemonade.version | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}/" > lemonade.version + cat lemonade.version - name: Install Dependencies run: |- From c7d509f69cbaf635f928c337c36a0b7ac0e15a9e Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:10:12 +0000 Subject: [PATCH 07/12] Use environment injected local identifier suffix --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index a8a593b..9dc4d39 100644 --- a/setup.py +++ b/setup.py @@ -136,6 +136,9 @@ def build_extension(self, ext): version = None with open(os.path.join(here, "lemonade.version")) as f: version = f.read().strip() + suffix = os.environ.get("PYTHON_LOCAL_VERSION_IDENTIFIER", None) + if suffix is not None: + version = "{}+{}".format(version, suffix) class UploadCommand(Command): From f3f8875be289f52ef89d3c8179fb3dc8d72e927b Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:10:26 +0000 Subject: [PATCH 08/12] Update python build to match --- .github/workflows/python.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 691deee..f9f0170 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -53,13 +53,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Replace lemonade.version with python friendly name - if: github.ref == 'refs/heads/main' - run: | - SHA256SHORT=$(git rev-parse --short HEAD) - cat lemonade.version | sed 's/^v//g' | sed "s/$/+${SHA256SHORT}/" > lemonade.version - cat lemonade.version - - name: Install Dependencies run: |- sudo apt-get update @@ -106,7 +99,7 @@ jobs: - name: setup.py run: |- python3 -m pip install wheel - BUILD_ARCH=core-avx-i python3 setup.py bdist_wheel --universal + BUILD_ARCH=core-avx-i PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD) python3 setup.py bdist_wheel --universal # We're happy with just compile for the moment, so cache gets some seeding. - name: Install onto root python lib From 4524aca3316293ab97e1ff1c5a3647a67ada18fd Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:14:13 +0000 Subject: [PATCH 09/12] Use another step to place conditional --- .github/workflows/python.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index f9f0170..18bed9e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -96,10 +96,15 @@ jobs: run: |- ccache -s # Print current cache stats ccache -z # Zero cache entry + + - name: Inject local version identifier for non tag builds + run: |- + echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + - name: setup.py run: |- python3 -m pip install wheel - BUILD_ARCH=core-avx-i PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD) python3 setup.py bdist_wheel --universal + BUILD_ARCH=core-avx-i python3 setup.py bdist_wheel --universal # We're happy with just compile for the moment, so cache gets some seeding. - name: Install onto root python lib From 686d1f96479605d255bfcb8cc13b0e5c50ee2b0e Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:17:21 +0000 Subject: [PATCH 10/12] Adding selective to mac and ubuntu on push to main --- .github/workflows/python.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 18bed9e..c55325e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -98,6 +98,7 @@ jobs: ccache -z # Zero cache entry - name: Inject local version identifier for non tag builds + if: github.ref == 'refs/heads/main' run: |- echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV @@ -189,6 +190,11 @@ jobs: run: |- echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV + - name: Inject local version identifier for non tag builds + if: github.ref == 'refs/heads/main' + run: |- + echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + - name: setup.py run: |- python3 -m pip install --upgrade packaging wheel From 63bbd305cc18830f1beed0e5a35b9483f81f325d Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:21:34 +0000 Subject: [PATCH 11/12] Anything that is not a tagged semantic version gets commit injected --- .github/workflows/python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index c55325e..226b392 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -98,7 +98,7 @@ jobs: ccache -z # Zero cache entry - name: Inject local version identifier for non tag builds - if: github.ref == 'refs/heads/main' + if: !startsWith(github.ref, 'refs/tags/v') run: |- echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV @@ -191,7 +191,7 @@ jobs: echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV - name: Inject local version identifier for non tag builds - if: github.ref == 'refs/heads/main' + if: !startsWith(github.ref, 'refs/tags/v') run: |- echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV From 8bb962fffc6ddd9fd245ced9c28f0079fbd0731b Mon Sep 17 00:00:00 2001 From: Jerin Philip Date: Wed, 26 Jan 2022 19:24:20 +0000 Subject: [PATCH 12/12] Trying expression --- .github/workflows/python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 226b392..c3ec1f2 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -98,7 +98,7 @@ jobs: ccache -z # Zero cache entry - name: Inject local version identifier for non tag builds - if: !startsWith(github.ref, 'refs/tags/v') + if: ${{ !startsWith(github.ref, 'refs/tags/v') }} run: |- echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV @@ -191,7 +191,7 @@ jobs: echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV - name: Inject local version identifier for non tag builds - if: !startsWith(github.ref, 'refs/tags/v') + if: ${{ !startsWith(github.ref, 'refs/tags/v') }} run: |- echo "PYTHON_LOCAL_VERSION_IDENTIFIER=$(git rev-parse --short HEAD)" >> $GITHUB_ENV