CI: fix ifs conditions (#1310)

Lightning-AI · Nov 3, 2022 · 0c66f03 · 0c66f03
1 parent 4de730f
commit 0c66f03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/ci_integrate.yml b/.github/workflows/ci_integrate.yml
@@ -52,14 +52,10 @@ jobs:
     - uses: ./.github/actions/caching
       with:
         os: ${{ runner.os }}
-        # requires: ${{ matrix.requires }}
+        requires: ${{ matrix.requires }}
         python-version: ${{ matrix.python-version }}
         offset: "integrate"
 
-    - name: Set min. dependencies
-      if: inputs.requires == 'oldest'
-      run: python .github/assistant.py set-oldest-versions --req_files=requirements/integrate.txt
-
     - name: Freeze PIL (hotfix)
       # import of PILLOW_VERSION which they recently removed in v9.0 in favor of __version__
       run: pip install "Pillow<9.0"  # It messes with torchvision

diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml
@@ -54,18 +54,18 @@ jobs:
 
     # Github Actions: Run step on specific OS: https://stackoverflow.com/a/57948488/4521646
     - name: Setup macOS
-      if: runner.os == 'macOS'
+      if: ${{ runner.os == 'macOS' }}
       run: |
         python -c "print('UNITTEST_TIMEOUT=--timeout=120')" >> $GITHUB_ENV
         brew install gcc libomp ffmpeg # https://github.com/pytorch/pytorch/issues/20030
     - name: Setup Linux
-      if: runner.os == 'Linux'
+      if: ${{ runner.os == 'Linux' }}
       run: |
         python -c "print('UNITTEST_TIMEOUT=--timeout=120')" >> $GITHUB_ENV
         sudo apt update --fix-missing
         sudo apt install -y ffmpeg
     - name: Setup Windows
-      if: runner.os == 'windows'
+      if: ${{ runner.os == 'windows' }}
       run: |
         choco install ffmpeg