From e303a24b3b7d9d31be4e4ed22bc4c8c1300e676a Mon Sep 17 00:00:00 2001 From: Marek Mihok Date: Wed, 31 Jan 2024 11:29:44 +0100 Subject: [PATCH 1/2] fix: make conda package platform and python version independent #2227 --- .github/workflows/release-wave.yml | 3 ++- py/h2o_wave/conda/meta.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-wave.yml b/.github/workflows/release-wave.yml index a67bff1165..1561ffe9f3 100644 --- a/.github/workflows/release-wave.yml +++ b/.github/workflows/release-wave.yml @@ -75,9 +75,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Publish to Conda - uses: amauryval/publish_conda_package_action@1.1.0 + uses: amauryval/publish_conda_package_action@2.0.3 with: CondaDir: 'py/h2o_wave/conda' + Platforms: 'noarch' CondaUsername: ${{ secrets.CONDA_USERNAME }} CondaPassword: ${{ secrets.CONDA_PASSWORD }} env: diff --git a/py/h2o_wave/conda/meta.yaml b/py/h2o_wave/conda/meta.yaml index 329a991391..d6ea34e3e6 100644 --- a/py/h2o_wave/conda/meta.yaml +++ b/py/h2o_wave/conda/meta.yaml @@ -26,6 +26,7 @@ source: path: .. build: + noarch: python script: python -m pip install . -vv entry_points: {% for module, entrypoints in project['scripts'].items() %} From c79eddc2672d1f2b21a9c696743913b1bef18b23 Mon Sep 17 00:00:00 2001 From: Marek Mihok Date: Wed, 31 Jan 2024 16:02:28 +0100 Subject: [PATCH 2/2] chore: sync publish-conda with release-wave workflow #2227 --- .github/workflows/publish-conda.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-conda.yml b/.github/workflows/publish-conda.yml index 0b0e62ecd0..6c48096909 100644 --- a/.github/workflows/publish-conda.yml +++ b/.github/workflows/publish-conda.yml @@ -23,7 +23,10 @@ jobs: - name: Publish to Conda uses: amauryval/publish_conda_package_action@2.0.3 with: - CondaDir: 'py/conda' + CondaDir: 'py/h2o_wave/conda' Platforms: 'noarch' CondaUsername: ${{ secrets.CONDA_USERNAME }} CondaPassword: ${{ secrets.CONDA_PASSWORD }} + env: + # VERSION clashes with conda build. Use PKG_VERSION instead. + PKG_VERSION: ${{ env.VERSION }}