From 13f95a50052f5875b054df85ebd7f1eb16aa646b Mon Sep 17 00:00:00 2001 From: Ayoub Benaissa Date: Tue, 21 May 2024 09:42:58 +0100 Subject: [PATCH 1/2] fix(ci): do not continue on linux build errors --- .github/workflows/concrete_python_release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/concrete_python_release.yml b/.github/workflows/concrete_python_release.yml index 32fac6bf76..9d2c910295 100644 --- a/.github/workflows/concrete_python_release.yml +++ b/.github/workflows/concrete_python_release.yml @@ -31,7 +31,6 @@ env: jobs: build-linux-x86: - continue-on-error: true strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] From 8af850a71912062a22d09c6749ae84aacc27be83 Mon Sep 17 00:00:00 2001 From: Ayoub Benaissa Date: Tue, 21 May 2024 09:50:03 +0100 Subject: [PATCH 2/2] fix(ci): update nightly version format to MAJOR.MINOR.PATCH-devYEARMONTHDAY also set nightly version for both macos and linux --- .github/workflows/concrete_python_release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/concrete_python_release.yml b/.github/workflows/concrete_python_release.yml index 9d2c910295..95fc37ea2b 100644 --- a/.github/workflows/concrete_python_release.yml +++ b/.github/workflows/concrete_python_release.yml @@ -58,8 +58,9 @@ jobs: if: ${{ env.RELEASE_TYPE == 'nightly' }} run: | NIGHTLY_VERSION=$(date +"%Y.%m.%d") + NIGHTLY_VERSION_ONE_NUMBER=$(date +"%Y%m%d") LATEST_RELEASE_VERSION=`git tag -l |grep "v.*" |sort |tail -n 1 | grep -e '[0-9].*' -o` - echo "__version__ = \"${LATEST_RELEASE_VERSION}-dev${NIGHTLY_VERSION}\"" >| frontends/concrete-python/version.txt + echo "__version__ = \"${LATEST_RELEASE_VERSION}-dev${NIGHTLY_VERSION_ONE_NUMBER}\"" >| frontends/concrete-python/version.txt git tag nightly-$NIGHTLY_VERSION || true git push origin nightly-$NIGHTLY_VERSION || true @@ -141,7 +142,11 @@ jobs: - name: Set release version (nightly) if: ${{ env.RELEASE_TYPE == 'nightly' }} - run: echo "__version__ = \"$(date +"%Y.%m.%d")\"" >| frontends/concrete-python/version.txt + run: | + NIGHTLY_VERSION=$(date +"%Y.%m.%d") + NIGHTLY_VERSION_ONE_NUMBER=$(date +"%Y%m%d") + LATEST_RELEASE_VERSION=`git tag -l |grep "v.*" |sort |tail -n 1 | grep -e '[0-9].*' -o` + echo "__version__ = \"${LATEST_RELEASE_VERSION}-dev${NIGHTLY_VERSION_ONE_NUMBER}\"" >| frontends/concrete-python/version.txt - name: Set release version (public) if: ${{ env.RELEASE_TYPE == 'public' }}