Change how to get version number"

FZJ-IEK3-VSA · Feb 23, 2024 · 17e106d · 17e106d
1 parent 79cceee
commit 17e106d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/test_combined.yml b/.github/workflows/test_combined.yml
@@ -49,22 +49,22 @@ jobs:
               shell: pwsh
               id: fine-version
               run: |
-                  $FINE_STRING = conda run -n test_env conda list -e fine | Out-String
+                  $FINE_STRING = conda list -e -n test_env fine | Out-String
                   FINE_VERSION = [regex]::Match($FINE_STRING, 'fine=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "FINE_VERSION=$FINE_VERSION" >> $GITHUB_OUTPUT
             - name: Get fine version
               shell: pwsh
               id: other-version
               run: |
-                  $GEOKIT_STRING = conda run -n test_env conda list -e geokit | Out-String
+                  $GEOKIT_STRING = conda list -e -n test_env geokit | Out-String
                   $GEOKIT_VERSION = [regex]::Match($GEOKIT_STRING, 'geokit=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "GEOKIT_VERSION=$GEOKIT_VERSION" >> $GITHUB_OUTPUT
 
-                  $GLAES_STRING = conda run -n test_env conda list -e geokit | Out-String
+                  $GLAES_STRING = conda list -e -n test_env geokit | Out-String
                   $GLAES_VERSION = [regex]::Match($GLAES_STRING, 'glaes=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "GLAES_VERSION=$GLAES_VERSION" >> $GITHUB_OUTPUT
 
-                  $RESKIT_STRING = conda run -n test_env conda list -e reskit | Out-String
+                  $RESKIT_STRING = conda list -e -n test_env reskit | Out-String
                   $RESKIT_VERSION = [regex]::Match($RESKIT_STRING, 'glaes=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "RESKIT_VERSION=$RESKIT_VERSION" >> $GITHUB_OUTPUT
             - name: Checkout Fine

diff --git a/.github/workflows/test_fine_geokit.yml b/.github/workflows/test_fine_geokit.yml
@@ -21,7 +21,7 @@ on:
     # - cron: 0 0 * * 0
 
 jobs:
-    TestCombinedInstalaltions:
+    TestFineAndGeokitInstallation:
         name: Ex1 (${{ matrix.python-version }}, ${{ matrix.os }})
         runs-on: ${{ matrix.os }}
         strategy:
@@ -49,17 +49,18 @@ jobs:
               shell: pwsh
               id: fine-version
               run: |
-                  $FINE_STRING = conda run -n test_env conda list -e fine | Out-String
+                  $FINE_STRING = conda list -e -n test_env fine | Out-String
                   FINE_VERSION = [regex]::Match($FINE_STRING, 'fine=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "FINE_VERSION=$FINE_VERSION" >> $GITHUB_OUTPUT
-            - name: Get fine version
+                  echo $FINE_VERSION
+            - name: Get other version
               shell: pwsh
               id: other-version
               run: |
-                  $GEOKIT_STRING = conda run -n test_env conda list -e geokit | Out-String
+                  $GEOKIT_STRING = conda list -e -n test_env geokit | Out-String
                   $GEOKIT_VERSION = [regex]::Match($GEOKIT_STRING, 'geokit=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "GEOKIT_VERSION=$GEOKIT_VERSION" >> $GITHUB_OUTPUT
-
+                  echo $GEOKIT_VERSION
             - name: Checkout Fine
               uses: actions/checkout@v4
               with:

diff --git a/.github/workflows/test_geokit_comp.yml b/.github/workflows/test_geokit_comp.yml
@@ -21,7 +21,7 @@ on:
     # - cron: 0 0 * * 0
 
 jobs:
-    TestCombinedInstalaltions:
+    TestGeokitInstalaltionWithFineConstraints:
         name: Ex1 (${{ matrix.python-version }}, ${{ matrix.os }})
         runs-on: ${{ matrix.os }}
         strategy:
@@ -45,11 +45,11 @@ jobs:
                     echo "Installation done"
                     conda list -n test_env
                     echo "libaries printed"                          
-            - name: Get fine version
+            - name: Get fine geokit
               shell: pwsh
               id: other-version
               run: |
-                  $GEOKIT_STRING = conda run -n test_env conda list -e geokit | Out-String
+                  $GEOKIT_STRING = conda list -e -n test_env geokit | Out-String
                   $GEOKIT_VERSION = [regex]::Match($GEOKIT_STRING, 'geokit=(\d+\.\d+\.\d+)=').Groups[1].Value 
                   echo "GEOKIT_VERSION=$GEOKIT_VERSION" >> $GITHUB_OUTPUT