Fix wrong workflow reference in build_and_test.yml

equinor · Oct 4, 2024 · 8e0afc1 · 8e0afc1
1 parent a342528
commit 8e0afc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -92,7 +92,7 @@ jobs:
         test-type: [ 'test', 'integration-test', 'everest-models-test' ]
         python-version: [ '3.12' ]
         os: [ 'macos-latest' ]
-    uses: ./.github/workflows/test_ert.yml
+    uses: ./.github/workflows/test_everest.yml
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}

diff --git a/.github/workflows/test_everest.yml b/.github/workflows/test_everest.yml
@@ -34,30 +34,30 @@ jobs:
       uses: astral-sh/setup-uv@v3
 
     - name: Install HDF5 source files on mac
-      if: ${{ inputs.os == 'macOS' && (inputs.python-version == '3.8' || inputs.python-version == '3.9' )}}
+      if: ${{ runner.os == 'macOS' && (inputs.python-version == '3.8' || inputs.python-version == '3.9' )}}
       run: brew install hdf5
 
     - name: Install Everest and dependencies
       run: |
         uv pip install ".[dev,everest]"
 
     - name: Run Tests Linux
-      if: ${{ inputs.test-type == 'test' && inputs.os != 'macOS'}}
+      if: ${{ inputs.test-type == 'test' && runner.os != 'macOS'}}
       run: |
         pytest tests/everest -n 4 -m "not ui_test and not integration_test" --dist loadgroup -sv
 
     - name: Run Tests macOS
-      if: ${{ inputs.test-type == 'test' && inputs.os == 'macOS'}}
+      if: ${{ inputs.test-type == 'test' && runner.os == 'macOS'}}
       run: |
         python -m pytest tests/everest -n 4 -m "not ui_test and not integration_test and not fails_on_macos_github_workflow" --dist loadgroup -sv
 
     - name: Run Integration Tests Linux
-      if: ${{inputs.test-type == 'integration-test' && inputs.os != 'macOS'}}
+      if: ${{inputs.test-type == 'integration-test' && runner.os != 'macOS'}}
       run: |
         pytest tests/everest -n 4 -m "integration_test" --dist loadgroup
 
     - name: Run Integration Tests macOS
-      if: ${{inputs.test-type == 'integration-test' && inputs.os == 'macOS'}}
+      if: ${{inputs.test-type == 'integration-test' && runner.os == 'macOS'}}
       run: |
         python -m pytest tests/everest -n 4 -m "integration_test and not fails_on_macos_github_workflow" --dist loadgroup