diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 2477efebc9..83917531b0 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -9,7 +9,7 @@ on: jobs: backport: name: Backport - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # Only react to merged PRs for security reasons. # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. if: > diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml index 854f8e933e..acd7ef01f2 100644 --- a/.github/workflows/brakeman-analysis.yml +++ b/.github/workflows/brakeman-analysis.yml @@ -15,7 +15,7 @@ on: jobs: brakeman-scan: name: Brakeman Scan - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: # Checkout the repository to the GitHub Actions runner - name: Checkout diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54cb5718ce..7dc32952ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: jobs: check_yarn_lock: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Check yarn.lock steps: - uses: actions/checkout@v4 @@ -23,7 +23,7 @@ jobs: outputs: yarn_lock_changed: ${{ steps.changed-yarn-lock.outputs.any_changed }} build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Build JS packages needs: check_yarn_lock if: ${{ needs.check_yarn_lock.outputs.yarn_lock_changed }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ff7becffa5..5519590823 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: Standard: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v3 @@ -16,7 +16,7 @@ jobs: - name: Lint Ruby files run: bundle exec standardrb ESLint: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 @@ -36,7 +36,7 @@ jobs: - name: Lint code run: yarn eslint Prettier: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index acdc5bff94..1821afb177 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -6,7 +6,7 @@ on: jobs: stale: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/stale@v5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f41fd1234..358ca7c6dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: RSpec: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -105,9 +105,11 @@ jobs: if: failure() with: name: Screenshots - path: spec/dummy/tmp/screenshots + path: | + spec/dummy/tmp/capybara + spec/dummy/tmp/screenshots Jest: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: NODE_ENV: test steps: diff --git a/app/models/concerns/alchemy/picture_thumbnails.rb b/app/models/concerns/alchemy/picture_thumbnails.rb index ef3a234e81..aa4e907233 100644 --- a/app/models/concerns/alchemy/picture_thumbnails.rb +++ b/app/models/concerns/alchemy/picture_thumbnails.rb @@ -102,11 +102,10 @@ def image_cropper_settings # Show image cropping link for ingredient def allow_image_cropping? - settings[:crop] && picture && - picture.can_be_cropped_to?( - settings[:size], - settings[:upsample] - ) && !!picture.image_file + settings[:crop] && picture&.can_be_cropped_to?( + settings[:size], + settings[:upsample] + ) && !!picture.image_file end private