Skip to content

Remove test-plain #3670

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Remove test-plain #3670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Install unzip
run: apt-get update && apt-get install -y unzip
- name: Run tests
run: cp .env.testing.template .env.testing && make test-plain
run: cp .env.testing.template .env.testing && make test
env:
COLLECTION_SIGNING_PRIVATE_KEY: ${{ secrets.COLLECTION_SIGNING_PRIVATE_KEY }}
DATABASE_HOST: postgres
Expand Down
7 changes: 2 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@ build:
run:
swift run

test-plain:
swift test --disable-automatic-resolution --sanitize=thread --no-parallel

test: xcbeautify
set -o pipefail \
&& swift test --disable-automatic-resolution --sanitize=thread \
&& swift test --disable-automatic-resolution --sanitize=thread --no-parallel \
2>&1 | ./xcbeautify --renderer github-actions

test-query-performance: xcbeautify
Expand All @@ -58,7 +55,7 @@ test-fast:
xcbeautify:
rm -rf .build/checkouts/xcbeautify
git clone https://github.com/cpisciotta/xcbeautify.git .build/checkouts/xcbeautify
cd .build/checkouts/xcbeautify && git checkout 2.6.0 && make build
cd .build/checkouts/xcbeautify && git checkout 2.25.1 && make build
binpath=`cd .build/checkouts/xcbeautify && swift build -c release --show-bin-path` && ln -sf $$binpath/xcbeautify

docker-build: version
Expand Down
Loading