diff --git a/.github/workflows/customized-win-shells.yml b/.github/workflows/customized-win-shells.yml index f065903..642f1a5 100644 --- a/.github/workflows/customized-win-shells.yml +++ b/.github/workflows/customized-win-shells.yml @@ -8,6 +8,18 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: conda-incubator/setup-miniconda@v3 + with: + activate-environment: magtense-env + auto-update-conda: true + python-version: 3.12 + + - name: Install minimal packages + shell: bash -el {0} + run: | + conda install -y -c nvidia/label/cuda-12.6.3 cuda-nvcc + conda install -y -c conda-forge make + - name: Run x64 Native Tools Command Prompt for VS 2022 shell: cmd /k "{0}" -arch=amd64 -host_arch=x64 working-directory: ${{ github.workspace }}/source/MagTenseFortranCuda/cuda @@ -15,6 +27,9 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" ls -al LIB /VERBOSE + conda deactivate + conda activate magtense-env + make - name: Run Developer PowerShell for VS 2022 shell: pwsh -NoExit -ExecutionPolicy ByPass -File {0} diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 1b1a499..da73e33 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -18,9 +18,10 @@ jobs: - name: Compile Fortran files in Developer PowerShell for VS 2022 shell: pwsh -NoExit -ExecutionPolicy ByPass -File {0} - working-directory: ${{ github.workspace }}/python/src/magtense/lib/ run: | - "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" + cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\" + .\Launch-VsDevShell.ps1 + cd ${{ github.workspace }}/python/src/magtense/lib/ make ps - name: Compile with nvcc in x64 Native Tools Command Prompt for VS 2022