From 5e6fe5e3cf4877693d9b340ffec6305c01c77b41 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Tue, 11 Jun 2024 14:11:40 +1000 Subject: [PATCH] Attempt to fix daily BBIM builds --- ...erbim-matrix.yml => ci-blenderbim-daily.yml} | 17 ++++++++--------- src/blenderbim/Makefile | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) rename .github/workflows/{ci-blenderbim-matrix.yml => ci-blenderbim-daily.yml} (83%) diff --git a/.github/workflows/ci-blenderbim-matrix.yml b/.github/workflows/ci-blenderbim-daily.yml similarity index 83% rename from .github/workflows/ci-blenderbim-matrix.yml rename to .github/workflows/ci-blenderbim-daily.yml index 1926b7542a..63e9c2e4f4 100644 --- a/.github/workflows/ci-blenderbim-matrix.yml +++ b/.github/workflows/ci-blenderbim-daily.yml @@ -1,4 +1,4 @@ -name: Publish-blenderbim-multiplatform +name: ci-blenderbim-daily on: push: @@ -17,11 +17,7 @@ on: - 'src/ifccityjson/**' branches: - v0.8.0 - -env: - major: 0 - minor: 0 - name: blenderbim + workflow_dispatch: jobs: activate: @@ -64,6 +60,9 @@ jobs: architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified python-version: '3.11' - run: echo ${{ env.DATE }} + - name: Get current version + id: version + run: echo "::set-output name=version::$(cat ../../VERSION)" - name: Get current date id: date run: echo "::set-output name=date::$(date +'%y%m%d')" @@ -76,8 +75,8 @@ jobs: uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip + file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip asset_name: blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip - tag: "blenderbim-${{steps.date.outputs.date}}" + tag: "blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}" overwrite: true - body: "Daily developer testing build blenderbim-${{steps.date.outputs.date}}" + body: "Daily developer testing build blenderbim-${{steps.version.outputs.version}}.${{steps.date.outputs.date}}" diff --git a/src/blenderbim/Makefile b/src/blenderbim/Makefile index 73c75486e8..8dbdd88b42 100644 --- a/src/blenderbim/Makefile +++ b/src/blenderbim/Makefile @@ -16,8 +16,8 @@ # You should have received a copy of the GNU General Public License # along with BlenderBIM Add-on. If not, see . -PYTHON:=python3.10 -PIP:=pip3.10 +PYTHON:=python3.11 +PIP:=pip3.11 PATCH:=patch SED:=sed -i ifeq ($(OS),Windows_NT)