Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Bloop server modules #2027

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
49 changes: 3 additions & 46 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,6 @@ jobs:
run: sbt "sbtBloop/publishLocal; sbtBloop/scripted"
shell: bash

bridges:
name: Test platform bridges
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: graalvm/setup-graalvm@v1
with:
version: '22.3.0'
java-version: '11'
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Tests
run: |
sbt \
"jsBridge06/publishLocal; \
jsBridge1/publishLocal; \
jsBridge06/test; \
jsBridge1/test"
shell: bash

launcher:
name: Launcher tests
runs-on: ${{ matrix.os }}
Expand All @@ -84,7 +58,7 @@ jobs:
- uses: graalvm/setup-graalvm@v1
with:
version: '22.3.0'
java-version: '11'
java-version: '17'
github-token: ${{ secrets.GITHUB_TOKEN }}
components: 'native-image'

Expand All @@ -102,7 +76,7 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]
jdk: ["22.3.0", "11"]

name: Test ${{ matrix.os }} -- ${{ matrix.jdk }}
name: Doc tests ${{ matrix.os }} -- ${{ matrix.jdk }}
env:
HYDRA_LICENSE: ${{ secrets.HYDRA_LICENSE }}

Expand Down Expand Up @@ -138,14 +112,7 @@ jobs:

- name: Compile and test main projects
run: |
sbt \
"frontend/test:compile; \
backend/test; \
docs/compile; \
frontend/testOnly bloop.ScalaVersionsSpec; \
frontend/testOnly -bloop.ScalaVersionsSpec; \
frontend/runMain bloop.util.CommandsDocGenerator --test; \
frontend/runMain bloop.util.CommandsDocGenerator --out ../docs/cli/reference.md"
sbt docs/compile
shell: bash

- name: Check docs are up-to-date
Expand Down Expand Up @@ -268,13 +235,3 @@ jobs:
mv bloop-artifacts frontend/target/graalvm-binaries
sbt "ci-release; docs/docusaurusPublishGhpages"
shell: bash

- name: Cut GitHub release and update installers on ${{ matrix.os }}
run: |
if [[ $GITHUB_REF == "refs/tags"* ]]; then
. bin/ci-setup-bloopoid-keys.sh
export GITHUB_TOKEN="$BLOOPOID_GITHUB_TOKEN"
sbt "frontend/updateHomebrewFormula; frontend/updateScoopFormula; frontend/githubRelease"
else
echo "skipping release since this is a merge and no new tag is detected"
fi
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ package-lock.json
.metals/
**/metals.sbt
*.lock
benchmark-bridge/corpus/
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
path = nailgun
url = https://github.com/scalacenter/nailgun.git
branch = sync-19-01-2018
[submodule "compiler-benchmark"]
path = benchmark-bridge
url = https://github.com/scalacenter/compiler-benchmark
branch = bloop
1 change: 0 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ project.git = true
project.excludeFilters = [
"zinc/"
"nailgun/"
"benchmark-bridge/"
]
17 changes: 0 additions & 17 deletions backend/src/main/java/bloop/scalasig/CustomAttribute.java

This file was deleted.