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

Revert scalafmt fix #1402

Merged
merged 2 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gifs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN echo 'def a = 123' > a.scala
RUN scala-cli compile a.scala || echo "Problems with bloop"

# Update path to point to newer version
RUN curl -fLo scala-cli.deb https://github.com/VirtusLab/scala-cli/releases/download/v0.1.9/scala-cli-x86_64-pc-linux.deb
RUN curl -fLo scala-cli.deb https://github.com/VirtusLab/scala-cli/releases/download/v0.1.15/scala-cli-x86_64-pc-linux.deb
RUN dpkg -i scala-cli.deb

COPY *.sh /data/
Expand Down
3 changes: 0 additions & 3 deletions gifs/scenarios/defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
if [[ -z "${ASCIINEMA_REC}" ]]; then
# Warm up scala-cli
echo "println(1)" | scala-cli -
echo "
version = 3.5.8
runner.dialect = scala3" > .scalafmt.conf
scala-cli fmt .
# or do other preparation (e.g. create code)
else
Expand Down
8 changes: 1 addition & 7 deletions website/docs/cookbooks/gh-action.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,8 @@ jobs:

To check the code style of your sources, you can use [Scalafmt](https://scalameta.org/scalafmt/).

Before running Scalafmt, you need to create a `.scalafmt.conf` configuration file:

```scala
version = 3.5.2
runner.dialect = scala3
```

and then check your code format in GitHub CI by adding new job `format`:
To check your code format in GitHub CI by adding new job `format`:
```yaml
format:
runs-on: "ubuntu-latest"
Expand Down
2 changes: 1 addition & 1 deletion website/static/img/dark/defaults.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/static/img/dark/gifs/defaults.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion website/static/img/defaults.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified website/static/img/gifs/defaults.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.