Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make CI faster, more timeouts sooner #601

Merged
merged 2 commits into from
Nov 9, 2023
Merged

make CI faster, more timeouts sooner #601

merged 2 commits into from
Nov 9, 2023

Conversation

LucioFranco
Copy link
Contributor

@LucioFranco LucioFranco commented Nov 9, 2023

  • Merges make wasm and maketest into a single sqlite3 test and only runs if we change any files in the libsql-sqlite3 directory.
  • Removes needing to build sqlite3 from scratch before running cargo build in the go tests, we don't actually use any of the stuff generated by the make command since we manually copy the amalgamated C file into our rust code.
  • Added some config for cargo nextest to catch timeout tests so we don't get 3h+ CI jobs

Comment on lines -42 to -50

- name: reconfigure with Wasm in WasmEdge mode
run: make clean && ./configure --enable-wasm-runtime-wasmedge

- name: Run tests
run: make test

- name: Run tests with Wasm
run: make rusttestwasm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this going?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I talked with @psarna this morning, we don't need wasmedge right now and the first pass covers enough for all our C code. We were duplicating a lot of work.

Comment on lines -1 to -41
name: Makefile CI

on:
push:
branches: [ "main" ]
pull_request:
merge_group:
branches: [ "main" ]

jobs:
maketest:

runs-on: ubuntu-latest
defaults:
run:
working-directory: ./libsql-sqlite3

steps:
- uses: actions/checkout@v3

- name: get TCL
run: sudo apt-get install -y tcl8.6-dev

- name: Install Protoc
uses: arduino/setup-protoc@v2

- name: Install Wasmpack
uses: jetli/[email protected]
with:
version: 'latest'

- name: configure
run: ./configure

- name: Run tests
run: make test

# Rust tests are run under maketestwasm

- name: Run API tests
run: make testlibsql
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this going as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup as I said above, a lot of our make tests did a lot of the same so if we just do it with + wasm then it covers basically everything. This was after a chat with @psarna.

@LucioFranco LucioFranco added this pull request to the merge queue Nov 9, 2023
Merged via the queue into main with commit 384ee84 Nov 9, 2023
5 checks passed
@LucioFranco LucioFranco deleted the lucio/fix-ci branch November 9, 2023 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants