Skip to content

Commit

Permalink
Merge pull request #1516 from tgodzik/separate-integrations
Browse files Browse the repository at this point in the history
Separate build integration tests and remove unused bash scripts
  • Loading branch information
tgodzik authored Jun 21, 2021
2 parents b32fe8c + 567a389 commit ee6b4c1
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 70 deletions.
37 changes: 27 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,40 @@ on:

jobs:
scalafmt:
name: Formatting
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
submodules: true
fetch-depth: 0
- uses: olafurpg/setup-scala@v11
with:
java-version: [email protected]
- name: Check formatting
run: ./bin/scalafmt --test
integrations:
name: Build integrations tests
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest]
jdk: [[email protected]]
steps:
- uses: actions/[email protected]
with:
submodules: true
- uses: olafurpg/setup-scala@v11
with:
java-version: ${{ matrix.jdk }}
- name: Tests
run: |
./bin/sbt-ci.sh \
"mavenBloop/compile" \
"gradleBloop211/compile" \
"gradleBloop212/compile" \
"gradleBloop212/test" \
"sbtBloop10Shaded/publishLocal" \
"sbtBloop10/scripted"
shell: bash
test:
runs-on: ${{ matrix.os }}
strategy:
Expand Down Expand Up @@ -78,16 +101,10 @@ jobs:
which gu && gu install native-image
./bin/sbt-ci.sh "install" "launcher/test"
shell: bash
- name: Run build tool + native tests
- name: Benchmark
if: matrix.jdk == '[email protected]' && matrix.os != 'windows-latest'
run: |
./bin/sbt-ci.sh \
"mavenBloop/compile" \
"gradleBloop211/compile" \
"gradleBloop212/compile" \
"gradleBloop212/test" \
"sbtBloop10Shaded/publishLocal" \
"sbtBloop10/scripted" \
"benchmarks/jmh:run .*HotBloopBenchmark.* -wi 0 -i 1 -f1 -t1 -p project=with-tests -p projectName=with-tests"
shell: bash

Expand Down
13 changes: 0 additions & 13 deletions bin/ci-clone.sh

This file was deleted.

35 changes: 0 additions & 35 deletions bin/detect-community-build.sh

This file was deleted.

12 changes: 0 additions & 12 deletions bin/set-up-community-build-infra.sh

This file was deleted.

0 comments on commit ee6b4c1

Please sign in to comment.