Skip to content

Commit

Permalink
Merge pull request #3122 from tvdeyen/gh-ubuntu-22
Browse files Browse the repository at this point in the history
CI: Run actions on ubuntu-22.04
  • Loading branch information
tvdeyen authored Jan 4, 2025
2 parents efae27c + 34df78a commit 640486d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/brakeman-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
check_bun_lock:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Check bun.lockdb
steps:
- uses: actions/checkout@v4
Expand All @@ -31,7 +31,7 @@ jobs:
bun_lock_changed: ${{ steps.changed-bun-lock.outputs.any_changed }}

build_javascript:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Build JS packages
needs: check_bun_lock
if: needs.check_bun_lock.outputs.bun_lock_changed == 'true'
Expand All @@ -58,7 +58,7 @@ jobs:
RSpec:
needs: [check_bun_lock, build_javascript]
if: ${{ success('check_bun_lock') && !failure('build_javascript') }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -152,10 +152,12 @@ jobs:
if: failure()
with:
name: Screenshots
path: spec/dummy/tmp/screenshots
path: |
spec/dummy/tmp/capybara
spec/dummy/tmp/screenshots
PushJavascript:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [check_bun_lock, RSpec]
if: github.event_name == 'pull_request'
steps:
Expand Down Expand Up @@ -187,7 +189,7 @@ jobs:
branch: ${{ github.head_ref }}

Jest:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
NODE_ENV: test
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency:

jobs:
Standard:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -21,7 +21,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@v4
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Lint code
run: bun run --bun eslint
Prettier:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/stale@v5
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
end
gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"

gem "alchemy_i18n", github: "AlchemyCMS/alchemy_i18n", branch: "download-flatpickr-locales"
gem "alchemy_i18n", github: "AlchemyCMS/alchemy_i18n", branch: "main"

group :development, :test do
gem "execjs", "~> 2.9.1"
Expand Down

0 comments on commit 640486d

Please sign in to comment.