Update CI code for nicer handling of the env
@@ -19,10 +19,10 @@ jobs:
exclude_tests: "--excludes docker"
# GH OS X runners only support very very very very old CPUs so we can't use anything
# fancy here and got to fall back to the minimal SSE4.2 requirement for simd_json
- rust_flags: "-C target-feature=+sse4.2"
+ target_feature: "+sse4.2"
- os: "ubuntu-latest"
exclude_tests: ""
- rust_flags: "-C target-feature=+avx,+avx2,+sse4.2"
+ target_feature: "+avx,+avx2,+sse4.2"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
@@ -37,24 +37,27 @@ jobs:
- name: Build test runner
run: cargo build -p tremor-cli
env:
- RUSTFLAGS: "${{ matrix.rust_flags }}"
+ RUSTFLAGS: "-C target-feature=${{ matrix.target_feature }}"
- name: Run Integration Tests
- # TREMOR_PATH can't be in env since `GITHUB_WORKSPACE` seems not to be set
- run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test integration tremor-cli/tests ${{ matrix.exclude_tests }}
+ run: cargo run -p tremor-cli -- test integration tremor-cli/tests ${{ matrix.exclude_tests }}
env:
- RUSTFLAGS: "${{ matrix.rust_flags }}"
+ TREMOR_PATH: "${{ github.workspace }}/tremor-script/lib"
+ RUSTFLAGS: "-C target-feature=${{ matrix.target_feature }}"
- name: Run API Tests
- run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test api tremor-cli/tests ${{ matrix.exclude_tests }}
+ run: cargo run -p tremor-cli -- test api tremor-cli/tests ${{ matrix.exclude_tests }}
env:
- RUSTFLAGS: "${{ matrix.rust_flags }}"
+ TREMOR_PATH: "${{ github.workspace }}/tremor-script/lib"
+ RUSTFLAGS: "-C target-feature=${{ matrix.target_feature }}"
- name: Run Unit Tests
- run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test unit tremor-cli/tests ${{ matrix.exclude_tests }}
+ run: cargo run -p tremor-cli -- test unit tremor-cli/tests ${{ matrix.exclude_tests }}
env:
- RUSTFLAGS: "${{ matrix.rust_flags }}"
+ TREMOR_PATH: "${{ github.workspace }}/tremor-script/lib"
+ RUSTFLAGS: "-C target-feature=${{ matrix.target_feature }}"
- name: Run Command Tests
- run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test command tremor-cli/tests ${{ matrix.exclude_tests }}
+ run: cargo run -p tremor-cli -- test command tremor-cli/tests ${{ matrix.exclude_tests }}
env:
- RUSTFLAGS: "${{ matrix.rust_flags }}"
+ TREMOR_PATH: "${{ github.workspace }}/tremor-script/lib"
+ RUSTFLAGS: "-C target-feature=${{ matrix.target_feature }}"
- name: Upload error logs
uses: actions/upload-artifact@v2
if: failure()
