diff options
| author | Juan J. Martinez <jjm@usebox.net> | 2023-06-21 21:03:09 +0100 |
|---|---|---|
| committer | Juan J. Martinez <jjm@usebox.net> | 2023-06-21 21:03:09 +0100 |
| commit | 12a7d32057e621dd0a0678036707a118c55318e7 (patch) | |
| tree | 25b7175045ff9cdd95fc437292ac8c55dfb8b004 | |
| parent | 03d866dfd433e5b4d827852d8f0d1c771ff0febc (diff) | |
| download | spacebeans-12a7d32057e621dd0a0678036707a118c55318e7.tar.gz spacebeans-12a7d32057e621dd0a0678036707a118c55318e7.zip | |
Moving out of GitLab
| -rw-r--r-- | .gitlab-ci.yml | 24 | ||||
| -rw-r--r-- | Deployment.md | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | server/src/net/usebox/gemini/server/ServerApp.scala | 2 | ||||
| -rw-r--r-- | server/test/src/handlers/GeminiHandlerSpec.scala | 1 |
5 files changed, 4 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a3464c2..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,24 +0,0 @@ -image: openjdk:11 - -variables: - MILL_CLI: "-D coursier.cache=$CI_PROJECT_DIR/.cache -j 0" - -cache: - paths: - - .cache/ - -test: - script: - - ./mill $MILL_CLI mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll __.sources - - ./mill $MILL_CLI server.test - -package: - script: - - ./mill $MILL_CLI server.assembly - artifacts: - paths: - - out/server/assembly.dest/*.jar - when: on_success - expire_in: never - rules: - - if: $CI_COMMIT_TAG diff --git a/Deployment.md b/Deployment.md index 4f3aea9..d9aa974 100644 --- a/Deployment.md +++ b/Deployment.md @@ -30,7 +30,7 @@ adduser --quiet \ ``` mkdir -p /opt/spacebeans cd /opt/spacebeans -# get the URL to the latest JAR from https://gitlab.com/reidrac/spacebeans/-/releases +# get the URL to the latest JAR from https://www.usebox.net/jjm/spacebeans/releases wget URL/spacebeans-VERSION.jar ``` @@ -23,7 +23,7 @@ If you have a Gemini browser, you can also visit: `gemini://capsule.usebox.net/s ## How to run it -Download [the `jar` distribution file](https://gitlab.com/reidrac/spacebeans/-/releases) and install Java Runtime Environment 11 (or +Download [the `jar` distribution file](https://www.usebox.net/jjm/spacebeans/releases) and install Java Runtime Environment 11 (or later; [OpenJDK's JRE](https://adoptium.com/) recommended). You can run the service with: @@ -138,7 +138,7 @@ print('\n'.join([k + "=" + v for k, v in os.environ.items()])) Requirements: - JDK 11 (or later) - - git (the git repo is required to set the version; GitLab's source archives won't compile) + - git (the git repo is required to set the version) Run the server with `./mill server.run` and the tests with `./mill server.test`. diff --git a/server/src/net/usebox/gemini/server/ServerApp.scala b/server/src/net/usebox/gemini/server/ServerApp.scala index 0f48e48..30e9d8e 100644 --- a/server/src/net/usebox/gemini/server/ServerApp.scala +++ b/server/src/net/usebox/gemini/server/ServerApp.scala @@ -22,7 +22,7 @@ object ServerApp { help("help").text("Displays this help and exits") version("version") - note("\nProject page: https://gitlab.com/reidrac/spacebeans") + note("\nProject page: https://www.usebox.net/jjm/spacebeans") } def main(args: Array[String]): Unit = diff --git a/server/test/src/handlers/GeminiHandlerSpec.scala b/server/test/src/handlers/GeminiHandlerSpec.scala index f6da826..158042c 100644 --- a/server/test/src/handlers/GeminiHandlerSpec.scala +++ b/server/test/src/handlers/GeminiHandlerSpec.scala @@ -514,7 +514,6 @@ class GeminiHandlerSpec extends AnyFlatSpec with Matchers { } it should "resolve CGI directories from more to less specific" in { - // issue: https://gitlab.com/reidrac/spacebeans/-/issues/2 val cgi = handleWith( new GeminiHandler(TestData.cgiPrefConf), "gemini://localhost/dir/sub/cgiOk/path/info" |