Skip to content

Commit

Permalink
chore: fix submodule init (apache#244)
Browse files Browse the repository at this point in the history
* chore: make ci checkout with submodules

* chore: avoid clone submodule manually

* chore: set submodules as true

* chore: avoid generate test coverage file

* chore: remove result.json from gitignore
  • Loading branch information
ShiKaiWi authored Sep 13, 2022
1 parent c150bad commit e39650e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
rust: [nightly-2022-08-08]
steps:
- uses: actions/checkout@v3
# with:
# submodules: true
with:
submodules: true
- run: |
rustup set auto-self-update disable
rustup toolchain install ${{ matrix.rust }} --profile minimal
Expand Down Expand Up @@ -82,8 +82,8 @@ jobs:
rust: [nightly-2022-08-08]
steps:
- uses: actions/checkout@v3
# with:
# submodule: true
with:
submodules: true
- run: |
rustup set auto-self-update disable
rustup toolchain install ${{ matrix.rust }} --profile minimal
Expand All @@ -105,7 +105,6 @@ jobs:
- name: Run Tests
run: |
cp ${LOCK_FILE} ${LOCK_FILE}.bak
git clone https://github.com/apache/parquet-testing.git components/parquet-testing
make test-ut
echo "Checking if ${LOCK_FILE} has changed..."
diff ${LOCK_FILE} ${LOCK_FILE}.bak
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- 'Dockerfile'
- 'docker/**'
push:
branches:
- main
paths:
- '.github/workflows/docker-build-image.yml'
- 'Dockerfile'
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ test-ut:
echo $(CARGO_INCREMENTAL)
echo $(RUSTFLAGS)
echo $(RUSTDOCFLAGS)
# cd $(DIR); cargo test --workspace -- -Z unstable-options --format json | tee results.json; \
# cat results.json | cargo2junit > ${WORKSPACE}/testresult/TEST-all.xml
cd $(DIR); cargo test --workspace
#cd $(DIR); cargo test --workspace -- -Z unstable-options --format json | tee results.json; \
#cat results.json | cargo2junit > ${WORKSPACE}/testresult/TEST-all.xml
cargo test --workspace

fmt:
cd $(DIR); cargo fmt -- --check
Expand Down

0 comments on commit e39650e

Please sign in to comment.