Skip to content

Commit

Permalink
bloop-rifle update: fix build by turning bloop off and on again
Browse files Browse the repository at this point in the history
This has come up before, that when building bleep while it changes bloop release in the middle is complicated.

try to first compile and build a dev-script with the old bloop, turn it off, and then run the devscript version
  • Loading branch information
oyvindberg committed Sep 22, 2023
1 parent eb8cc9b commit a7ab124
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ jobs:
env:
CI: true
run: |
bleep compile
bleep test
bleep compile bleep-cli@jvm3
bleep setup-dev-script bleep-cli@jvm3
bleep config compile-server stop-all
./bleep-cli@jvm3.sh test
build-native-image:
name: Native image build on ${{ matrix.os }}
Expand Down Expand Up @@ -64,8 +66,10 @@ jobs:
- name: Build native image (non-windows)
# stop compile server after build since the new version may use a newer version of bloop
run: |
bleep native-image ${{ matrix.file_name }}
bleep compile bleep-cli@jvm3
bleep setup-dev-script bleep-cli@jvm3
bleep config compile-server stop-all
./bleep-cli@jvm3.sh native-image ${{ matrix.file_name }}
if: runner.os != 'Windows'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,6 @@
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "ch.epfl.scala.bsp4j.FileChangeType",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "ch.epfl.scala.bsp4j.InitializeBuildParams",
"allDeclaredConstructors": true,
Expand Down Expand Up @@ -573,13 +566,6 @@
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "ch.epfl.scala.bsp4j.TaskDataKind",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "ch.epfl.scala.bsp4j.TaskFinishParams",
"allDeclaredConstructors": true,
Expand Down

0 comments on commit a7ab124

Please sign in to comment.