diff --git a/.github/workflows/build_conda.yml b/.github/workflows/build_conda.yml index 608272c..27f076d 100644 --- a/.github/workflows/build_conda.yml +++ b/.github/workflows/build_conda.yml @@ -25,10 +25,10 @@ jobs: shell: "bash -l {0}" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Get conda - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v4 with: python-version: ${{ matrix.python-version }} environment-file: etc/dev-env.yml @@ -36,10 +36,9 @@ jobs: channels: conda-forge conda-remove-defaults: "true" - - name: Disable upload run: conda config --set anaconda_upload no - name: Build - run: conda build conda-recipe + run: conda-build conda-recipe diff --git a/.github/workflows/build_conda_and_deploy_on_main.yml b/.github/workflows/build_conda_and_deploy_on_main.yml index 213895a..a26505d 100644 --- a/.github/workflows/build_conda_and_deploy_on_main.yml +++ b/.github/workflows/build_conda_and_deploy_on_main.yml @@ -21,10 +21,10 @@ jobs: shell: "bash -l {0}" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Get conda - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v4 with: python-version: ${{ matrix.python-version }} environment-file: etc/dev-env.yml @@ -38,5 +38,5 @@ jobs: - name: Build env: CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }} - run: conda build conda-recipe --user slsdetectorgroup --token ${CONDA_TOKEN} + run: conda-build conda-recipe --user slsdetectorgroup --token ${CONDA_TOKEN} diff --git a/etc/dev-env.yml b/etc/dev-env.yml index 8f41868..6873e22 100644 --- a/etc/dev-env.yml +++ b/etc/dev-env.yml @@ -5,12 +5,12 @@ dependencies: - anaconda-client - catch2 - conda-build - - doxygen + - doxygen - sphinx - - breathe - - sphinx_rtd_theme - - furo - - zeromq + - breathe + - sphinx_rtd_theme + - furo + - zeromq - pybind11 - numpy - matplotlib