Skip to content

Commit f5408d6

Browse files
authored
Fix failing integration tests in CI (#13300)
* run prettier on integrations * update media query syntax * drop oxide related workflows * rename `{workflow}-stable` to just `workflow`
1 parent d86fd0b commit f5408d6

26 files changed

+270
-1269
lines changed

.github/workflows/ci-stable.yml

-59
This file was deleted.

.github/workflows/ci.yml

+16-33
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
name: CI — Oxide
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: CI — Stable
25

36
on:
47
push:
5-
branches: [master, 3.3, 3.4]
8+
branches: [master]
69
pull_request:
710
branches: [master, 3.3, 3.4]
811

@@ -13,16 +16,15 @@ env:
1316
CI: true
1417
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
1518
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
16-
CACHE_PREFIX: oxide
19+
CACHE_PREFIX: stable
1720

1821
jobs:
1922
build:
2023
runs-on: ubuntu-latest
21-
timeout-minutes: 15
2224

2325
strategy:
2426
matrix:
25-
node-version: [18]
27+
node-version: [14, 18]
2628

2729
steps:
2830
- uses: actions/checkout@v3
@@ -31,46 +33,27 @@ jobs:
3133
with:
3234
node-version: ${{ matrix.node-version }}
3335

36+
- name: Use the `stable` engine
37+
run: |
38+
node ./scripts/swap-engines.js
39+
3440
- name: Cache node_modules
3541
uses: actions/cache@v3
3642
with:
3743
path: node_modules
3844
key: ${{ runner.os }}-${{ matrix.node-version }}-${{ env.CACHE_PREFIX }}-node_modules-${{ hashFiles('**/package-lock.json') }}
3945

40-
# Cargo already skips downloading dependencies if they already exist
41-
- name: Cache cargo
42-
uses: actions/cache@v3
43-
with:
44-
path: |
45-
~/.cargo/bin/
46-
~/.cargo/registry/index/
47-
~/.cargo/registry/cache/
48-
~/.cargo/git/db/
49-
target/
50-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
51-
52-
# Cache the `oxide` Rust build
53-
- name: Cache oxide build
54-
uses: actions/cache@v3
55-
with:
56-
path: |
57-
./oxide/target/
58-
./oxide/crates/node/*.node
59-
./oxide/crates/node/index.js
60-
./oxide/crates/node/index.d.ts
61-
key: ${{ runner.os }}-oxide-${{ hashFiles('./oxide/crates/**/*') }}
62-
6346
- name: Install dependencies
6447
run: npm install
6548

6649
- name: Build Tailwind CSS
67-
run: npx turbo run build --filter=//
50+
run: npm run build
6851

6952
- name: Test
7053
run: |
71-
npx turbo run test --filter=// || \
72-
npx turbo run test --filter=// || \
73-
npx turbo run test --filter=// || exit 1
54+
npm run test || \
55+
npm run test || \
56+
npm run test || exit 1
7457
7558
- name: Lint
76-
run: npx turbo run style --filter=//
59+
run: npm run style

.github/workflows/integration-tests-oxide.yml

-85
This file was deleted.

.github/workflows/integration-tests-stable.yml .github/workflows/integration-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration Tests — Stable
1+
name: Integration Tests
22

33
on:
44
push:

0 commit comments

Comments
 (0)