fix

adku1173 · May 22, 2024 · 48f2269 · 48f2269
1 parent 82a8e60
commit 48f2269
Showing 1 changed file with 24 additions and 23 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -1,12 +1,15 @@
-name: Test Build of conda packages
+name: Build and deploy conda package
 
-# Controls when the action will run.
 on:
+
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches: [ "*" ]
-  # pull_request:
-  #   branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+    branches: [ 'master' ] 
+
 
   # Allows you to run this workflow manually from the Actions tab
 #   workflow_dispatch:
@@ -32,25 +35,23 @@ jobs:
   conda_deploy:
     needs : conda_build_and_install
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: conda-package
-          path: ./conda_package
-      - name: Conda environment creation and activation
-        uses: ./.github/actions/setup-conda
-      - name: Install package
-        run: conda install -c ./conda_package acoular
-      - name: Install anaconda-client
-        run: conda install anaconda-client
-      - name: Upload package to Anaconda
-        shell: bash
-        env:
-          ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
-          ANACONDA_USER: ${{ secrets.ANACONDA_USER }}
-        run: anaconda -t "$ANACONDA_TOKEN" upload --user "$ANACONDA_USER" ./conda_package/noarch/acoular-*.tar.bz2
+    - name: Download artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: conda-package
+        path: ./conda_package
+    - name: Conda environment creation and activation
+      uses: ./.github/actions/setup-conda
+    - name: Install package
+      run: conda install -c ./conda_package acoular
+    - name: Install anaconda-client
+      run: conda install anaconda-client
+    - name: Upload package to Anaconda
+      shell: bash
+      env:
+        ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+        ANACONDA_USER: ${{ secrets.ANACONDA_USER }}
+      run: anaconda -t "$ANACONDA_TOKEN" upload --user "$ANACONDA_USER" ./conda_package/noarch/acoular-*.tar.bz2
 
   alls-green:
     name: Conda green?