Merge branch 'dev' into update-udpqueue

Author: topi314

.github/workflows/build.yml

@@ -2,14 +2,19 @@ name: Build
 
 on:
   push:
-    paths-ignore:
-      - '**.md'
+    branches: [ '**' ]
+    paths-ignore: [ '**.md' ]
+  workflow_call:
+    secrets:
+      DOCKERHUB_USERNAME:
+      DOCKERHUB_TOKEN:
 
 jobs:
-  gradle:
+  build:
     runs-on: ubuntu-latest
-    outputs:
-      rundocker: ${{ steps.rundocker.outputs.rundocker }}
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -33,29 +38,8 @@ jobs:
           name: Lavalink.jar
           path: LavalinkServer/build/libs/Lavalink.jar
 
-      - name: Check Docker Build
-        id: rundocker
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-        run: |
-          echo "Run docker build: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}"
-          echo "::set-output name=rundocker::${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}"
-
-  docker:
-    needs: gradle
-    runs-on: ubuntu-latest
-    if: needs.gradle.outputs.rundocker == 'true'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: Lavalink.jar
-
       - name: Docker Meta
+        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
         id: meta
         uses: docker/metadata-action@v4
         with:
@@ -68,18 +52,22 @@ jobs:
             type=sha,prefix=
 
       - name: Set up QEMU
+        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
+        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
         uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
+        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ env.DOCKERHUB_TOKEN }}
 
-      - name: Build and push
+      - name: Build and Push
+        if: env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN
         uses: docker/build-push-action@v3
         with:
           file: LavalinkServer/docker/Dockerfile
@@ -88,23 +76,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-  release:
-    needs: gradle
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: Lavalink.jar
-
-      - name: Upload Artifacts to GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Lavalink.jar

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: Lavalink.jar
+
+      - name: Upload Artifacts to GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: Lavalink.jar

LavalinkServer/.gitignore

@@ -6,4 +6,3 @@
 /debug_token
 build/*
 /out/
-VERSION.txt

LavalinkServer/build.gradle.kts

@@ -74,17 +74,10 @@ tasks {
     }
 
     processResources {
-        val buildNumber = if (System.getenv("CI") != null) {
-            System.getenv("BUILD_NUMBER") ?: "Unknown"
-        } else {
-            "Unofficial"
-        }
-
         val tokens = mapOf(
             "project.version"    to project.version,
             "project.groupId"    to project.group,
             "project.artifactId" to "Lavalink-Server",
-            "env.BUILD_NUMBER"   to buildNumber,
             "env.BUILD_TIME"     to System.currentTimeMillis().toString()
         )
 
@@ -137,11 +130,3 @@ fun versionFromTag(): String = Grgit.open(mapOf("currentDir" to project.rootDir)
 
     return if (headTag != null && clean) headTag.name else "${git.head().id}-SNAPSHOT"
 }
-
-//create a simple version file that we will be reading to create appropriate docker tags
-fun versionTxt() {
-    val versionTxt = File("$projectDir/VERSION.txt")
-    versionTxt.writeText("${project.version}\n")
-}
-
-versionTxt()

LavalinkServer/docker/Dockerfile

@@ -10,6 +10,6 @@ RUN chown -R lavalink:lavalink /opt/Lavalink
 
 USER lavalink
 
-COPY Lavalink.jar Lavalink.jar
+COPY LavalinkServer/build/libs/Lavalink.jar Lavalink.jar
 
 ENTRYPOINT ["java", "-Djdk.tls.client.protocols=TLSv1.1,TLSv1.2", "-Xmx4G", "-jar", "Lavalink.jar"]

LavalinkServer/src/main/java/lavalink/server/Launcher.kt

@@ -69,7 +69,6 @@ object Launcher {
         val commitTime = dtf.format(Instant.ofEpochMilli(gitRepoState.commitTime * 1000))
 
         val version = appInfo.version.takeUnless { it.startsWith("@") } ?: "Unknown"
-        val buildNumber = appInfo.buildNumber.takeUnless { it.startsWith("@") } ?: "Unofficial"
 
         return buildString {
             if (vanity) {
@@ -83,7 +82,6 @@ object Launcher {
             }
             appendln()
             append("${indentation}Version:        "); appendln(version)
-            append("${indentation}Build:          "); appendln(buildNumber)
             if (gitRepoState.isLoaded) {
                 append("${indentation}Build time:     "); appendln(buildTime)
                 append("${indentation}Branch          "); appendln(gitRepoState.branch)

LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt

@@ -46,7 +46,11 @@ class KoeConfiguration(val serverConfig: ServerConfig) {
                         bufferSize, UdpQueueFramePollerFactory.DEFAULT_BUFFER_DURATION)
                 bufferSize = UdpQueueFramePollerFactory.DEFAULT_BUFFER_DURATION
             }
-            setFramePollerFactory(UdpQueueFramePollerFactory(bufferSize, Runtime.getRuntime().availableProcessors()))
+            try {
+                setFramePollerFactory(UdpQueueFramePollerFactory(bufferSize, Runtime.getRuntime().availableProcessors()))
+            } catch (e: Throwable) {
+                log.warn("Failed to enable JDA-NAS! GC pauses may cause your bot to stutter during playback.", e)
+            }
         } else {
             log.warn("This system and architecture appears to not support native audio sending! "
                     + "GC pauses may cause your bot to stutter during playback.")

LavalinkServer/src/main/resources/app.properties

@@ -1,5 +1,4 @@
 version[email protected]@
 groupId[email protected]@
 artifactId[email protected]@
-buildNumber[email protected]_NUMBER@
 buildTime[email protected]_TIME@

README.md

@@ -119,7 +119,7 @@ Any client libraries marked with `Unmaintained` have been marked as such as thei
 however they are listed as they may still support Lavalink, and/or have not needed maintenance, however keep in mind that compatibility and full feature support is not guaranteed.
 
 ## Server configuration
-Download binaries from [the CI server](https://ci.fredboat.com/viewLog.html?buildId=lastSuccessful&buildTypeId=Lavalink_Build&tab=artifacts&guest=1) or [the GitHub releases](https://github.com/freyacodes/Lavalink/releases).
+Download binaries from [the GitHub actions](https://github.com/freyacodes/Lavalink/actions) or [the GitHub releases](https://github.com/freyacodes/Lavalink/releases)(specific versions prior to `v3.5` can be found in the [CI Server](https://ci.fredboat.com/viewLog.html?buildId=lastSuccessful&buildTypeId=Lavalink_Build&tab=artifacts&guest=1)). 
 
 Put an `application.yml` file in your working directory. ([Example here](https://github.com/freyacodes/Lavalink/blob/master/LavalinkServer/application.yml.example))
 

settings.gradle.kts

@@ -36,7 +36,7 @@ fun VersionCatalogBuilder.spring() {
 }
 
 fun VersionCatalogBuilder.voice() {
-    version("lavaplayer", "1.3.98.3")
+    version("lavaplayer", "1.3.98.4")
 
     library("lavaplayer",            "com.github.walkyst.lavaplayer-fork", "lavaplayer").versionRef("lavaplayer")
     library("lavaplayer-ip-rotator", "com.github.walkyst.lavaplayer-fork", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer")