Skip to content

Commit b5d39c2

Browse files
authored
Merge branch 'main' into patch-1
2 parents 9c6a4e9 + fee2e50 commit b5d39c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+17588
-2738
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"semi": ["error", "never"],
2626
"sort-imports": ["error", { "ignoreDeclarationSort": true }]
2727
},
28-
"ignorePatterns": ["dist/**/*.js", "**/vendor/**/*.js"],
28+
"ignorePatterns": ["dist/**/*.js", "**/vendor/**/*.js", "action_text-trix/**/*.js"],
2929
"globals": {
3030
"after": true,
3131
"getComposition": true,

.github/workflows/ci.yml

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,58 @@
11
name: CI
22

3+
concurrency:
4+
group: "${{github.workflow}}-${{github.ref}}"
5+
cancel-in-progress: true
6+
37
on:
48
push:
5-
branches:
6-
- main
9+
branches: [ main ]
710
pull_request:
11+
types: [opened, synchronize]
12+
branches: [ '*' ]
813

914
jobs:
1015
build:
1116
name: Browser tests
1217
runs-on: ubuntu-latest
1318
steps:
14-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
1520
- uses: actions/setup-node@v3
1621
with:
17-
node-version: 16
22+
node-version: 18
1823
cache: "yarn"
1924
- name: Install Dependencies
2025
run: yarn install --frozen-lockfile
2126
- run: bin/ci
27+
rails-tests:
28+
name: Downstream Rails integration tests
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v4
32+
- uses: actions/setup-node@v3
33+
with:
34+
node-version: 18
35+
cache: "yarn"
36+
- uses: ruby/setup-ruby@v1
37+
with:
38+
ruby-version: "3.4"
39+
- name: Install Dependencies
40+
run: yarn install --frozen-lockfile
41+
- name: Packaging
42+
run: yarn build
43+
- name: Clone Rails
44+
run: git clone --depth=1 https://github.com/rails/rails
45+
- name: Configure Rails
46+
run: |
47+
sudo apt install libvips-tools
48+
cd rails
49+
yarn install --frozen-lockfile
50+
bundle add action_text-trix --path ".."
51+
bundle show --paths action_text-trix
52+
- name: Action Text tests
53+
run: |
54+
cd rails/actiontext
55+
bundle exec rake test test:system
2256
2357
env:
2458
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.14.0
1+
18.18.0

0 commit comments

Comments
 (0)