Skip to content

Commit 0544fe2

Browse files
Merge pull request #106 from alexarchambault/merge-upstream
Merge upstream changes
2 parents cbbe37c + f5a2d64 commit 0544fe2

File tree

44 files changed

+159
-2448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+159
-2448
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,10 @@ jobs:
4242
run: |
4343
.github/setup-test-projects.sh &&\
4444
./bin/sbt-ci.sh \
45-
"jsBridge06/publishLocal" \
4645
"jsBridge1/publishLocal" \
47-
"jsBridge06/test" \
4846
"jsBridge1/test"
4947
shell: bash
5048

51-
launcher:
52-
name: Launcher tests
53-
runs-on: ${{ matrix.os }}
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
os: [ubuntu-latest, windows-latest, macOS-latest]
58-
jdk: ["graalvm-java17:21.3.0"]
59-
steps:
60-
- uses: actions/checkout@v3
61-
with:
62-
submodules: true
63-
fetch-depth: 0
64-
- uses: coursier/setup-action@v1.2.0-M3
65-
with:
66-
jvm: ${{ matrix.jdk }}
67-
- name: Tests
68-
run: |
69-
echo $JAVA_HOME
70-
which gu && gu install native-image
71-
./bin/sbt-ci.sh publishLocal "launcherTest/test"
72-
shell: bash
73-
7449
test:
7550
runs-on: ${{ matrix.os }}
7651
strategy:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ target/
2121
# Ensime's config and cache
2222
.ensime
2323
.ensime_cache/
24-
integrations/gradle-bloop/lib
2524

2625
# The index where we store project mappings for local benchmarks
2726
.local-benchmarks

bloop4j/src/main/java/bloop/bloop4j/BloopCompileReport.java

Lines changed: 0 additions & 210 deletions
This file was deleted.

bloop4j/src/main/java/bloop/bloop4j/BloopExtraBuildParams.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)