From 9f3b7abc0fba82ab763b173be9fed750c4fe0e3c Mon Sep 17 00:00:00 2001 From: AngRodrigues Date: Mon, 16 Dec 2024 15:18:17 +1100 Subject: [PATCH 1/3] fix: update tag in meta.yml --- conda/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index a89b34c..8e6bc6e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,8 +1,9 @@ {% set name = "loopprojectfile" %} +{% set version = "0.2.1" %} package: - name: "{{ name|lower }}" - version: "{{ environ.get('GIT_DESCRIBE_TAG', '') }}" + name: {{ name|lower }} + version: {{ version }} source: git_url: https://github.com/Loop3D/LoopProjectFile.git From 7c8be6680b1b174c06321cdb0ed70fbb50bcf614 Mon Sep 17 00:00:00 2001 From: AngRodrigues Date: Mon, 16 Dec 2024 15:23:24 +1100 Subject: [PATCH 2/3] fix: actually automate the version. --- conda/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 8e6bc6e..f692e53 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,9 +1,8 @@ {% set name = "loopprojectfile" %} -{% set version = "0.2.1" %} package: name: {{ name|lower }} - version: {{ version }} + version: "{{ environ.get('GIT_DESCRIBE_TAG', '').lstrip('v') }}" source: git_url: https://github.com/Loop3D/LoopProjectFile.git From 6497400fb422b7c8ee65696ae1dff5c644499ebc Mon Sep 17 00:00:00 2001 From: AngRodrigues Date: Mon, 16 Dec 2024 15:26:54 +1100 Subject: [PATCH 3/3] fix: also update the ubuntu --- .github/workflows/publish_conda.yml | 4 ++-- .github/workflows/pypi.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_conda.yml b/.github/workflows/publish_conda.yml index ac01245..e058e75 100644 --- a/.github/workflows/publish_conda.yml +++ b/.github/workflows/publish_conda.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: release-please: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: GoogleCloudPlatform/release-please-action@v4 id: release @@ -19,7 +19,7 @@ jobs: release_created: ${{ steps.release.outputs.release_created }} pypi: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: release-please if: ${{ needs.release-please.outputs.release_created }} steps: diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 6d53837..ed19a09 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -29,7 +29,7 @@ jobs: # path: ./wheelhouse/*.whl sdist: name: Build sdist - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -46,7 +46,7 @@ jobs: publish: name: Publish wheels to pypi - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: # IMPORTANT: this permission is mandatory for trusted publishing id-token: write