diff --git a/.github/workflows/conda-package-cf.yml b/.github/workflows/conda-package-cf.yml index cfc9582c..229b5f32 100644 --- a/.github/workflows/conda-package-cf.yml +++ b/.github/workflows/conda-package-cf.yml @@ -54,10 +54,6 @@ jobs: persist-credentials: false fetch-depth: 0 - - name: Set pkgs_dirs - run: | - echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc - - name: Cache conda packages uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 env: @@ -70,8 +66,11 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_tag || matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - - name: Add conda to system path - run: echo "$CONDA"/bin >> "$GITHUB_PATH" + - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0 + with: + miniforge-version: latest + activate-environment: "" + pkgs-dirs: ~/.conda/pkgs - name: Install conda-build run: conda install conda-build @@ -92,7 +91,7 @@ jobs: uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_tag || matrix.python }} - path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda + path: ${{ env.CONDA }}/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda test_linux: needs: build_linux @@ -133,8 +132,11 @@ jobs: with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_tag || matrix.python }} - - name: Add conda to system path - run: echo "$CONDA"/bin >> "$GITHUB_PATH" + - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0 + with: + miniforge-version: latest + activate-environment: "" + pkgs-dirs: ~/.conda/pkgs - name: Install conda-build run: conda install conda-build @@ -155,10 +157,6 @@ jobs: - name: Display lockfile run: cat lockfile - - name: Set pkgs_dirs - run: | - echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc - - name: Cache conda packages uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 env: diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index d6e129ea..e5329b45 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -54,10 +54,6 @@ jobs: persist-credentials: false fetch-depth: 0 - - name: Set pkgs_dirs - run: | - echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc - - name: Cache conda packages uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 env: @@ -70,12 +66,15 @@ jobs: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python_tag || matrix.python }}- ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}- - - name: Add conda to system path - run: echo "$CONDA"/bin >> "$GITHUB_PATH" + - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0 + with: + miniforge-version: latest + activate-environment: "" + pkgs-dirs: ~/.conda/pkgs - name: Store conda paths as envs run: | - echo "CONDA_BLD=/usr/share/miniconda/conda-bld/linux-64/" >> "$GITHUB_ENV" + echo "CONDA_BLD=$CONDA/conda-bld/linux-64/" >> "$GITHUB_ENV" echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE/" >> "$GITHUB_ENV" - name: Update conda @@ -156,8 +155,11 @@ jobs: with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_tag || matrix.python }} - - name: Add conda to system path - run: echo "$CONDA"/bin >> "$GITHUB_PATH" + - uses: conda-incubator/setup-miniconda@be893c923ea9cf1cf7cd510fbdde27c7e18cbdcb # v4.1.0 + with: + miniforge-version: latest + activate-environment: "" + pkgs-dirs: ~/.conda/pkgs - name: Update conda run: | @@ -196,10 +198,6 @@ jobs: - name: Display lockfile run: cat lockfile - - name: Set pkgs_dirs - run: | - echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc - - name: Cache conda packages uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 env: