removed extra conda

jitu5 · Mar 23, 2024 · a92ec45 · a92ec45
1 parent 9fe34a5
commit a92ec45
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 30 deletions.
diff --git a/.github/actions/win_setup/action.yml b/.github/actions/win_setup/action.yml
@@ -6,18 +6,7 @@ inputs:
     required: false
 runs:
   using: composite
-  steps:
-  - name: Install and initialize Miniconda
-    uses: conda-incubator/setup-miniconda@v2
-    with:
-      auto-update-conda: true
-      python-version: ${{ inputs.python_version }}         
-  # - name: Install and initialize Miniconda
-  #   run: |-
-  #     choco install miniconda3 -y
-  #     refreshenv
-  #     C:\tools\miniconda3\Scripts\conda init powershell
-  #   shell: pwsh  
+  steps:       
   - uses: actions/[email protected]
   - uses: "./.github/actions/win_setup_python_env"
     with:

diff --git a/.github/actions/win_setup_python_env/action.yml b/.github/actions/win_setup_python_env/action.yml
@@ -13,8 +13,8 @@ runs:
       auto-update-conda: true
       python-version: ${{ inputs.python_version }}
   - name: Explicitly initialize conda
-    run: conda init powershell
-    shell: pwsh      
+    run: conda init bash
+    shell: bash      
   - name: Create 'kedro-viz' conda environment
     run: conda create --name kedro-viz python=${{ inputs.python_version }} -y
     shell: bash

diff --git a/.github/workflows/build_backend.yml b/.github/workflows/build_backend.yml
@@ -49,10 +49,7 @@ jobs:
     - uses: actions/[email protected]
     - uses: "./.github/actions/win_setup"
       with:
-        python_version: "${{ matrix.python_version }}"
-    - name: Explicitly initialize conda
-      run: conda init powershell
-      shell: pwsh            
+        python_version: "${{ matrix.python_version }}"          
     - name: Run all end to end tests on Windows
       run: |
         conda activate kedro-viz
@@ -88,10 +85,7 @@ jobs:
     - uses: actions/[email protected]
     - uses: "./.github/actions/win_setup"
       with:
-        python_version: "${{ matrix.python_version }}"
-    - name: Explicitly initialize conda
-      run: conda init powershell
-      shell: pwsh           
+        python_version: "${{ matrix.python_version }}"          
     - name: Run Python tests on Windows
       run: |
         conda activate kedro-viz

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -48,10 +48,7 @@ jobs:
     - uses: actions/[email protected]
     - uses: "./.github/actions/win_setup"
       with:
-        python_version: "${{ matrix.python_version }}"
-    - name: Explicitly initialize conda
-      run: conda init bash
-      shell: bash           
+        python_version: "${{ matrix.python_version }}"          
     - name: Run all end to end tests on Windows
       run: conda activate kedro-viz; make e2e-tests
   unit_tests:
@@ -81,10 +78,7 @@ jobs:
     - uses: actions/[email protected]
     - uses: "./.github/actions/win_setup"
       with:
-        python_version: "${{ matrix.python_version }}"
-    - name: Explicitly initialize conda
-      run: conda init bash
-      shell: bash           
+        python_version: "${{ matrix.python_version }}"         
     - name: Run Python tests on Windows
       run: conda activate kedro-viz; make pytest
   lint: