diff --git a/Dockerfile b/Dockerfile index 9b6ad34dd..9f416f0a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,7 @@ RUN apt update && \ COPY --from=builder /home/server/package/bin/libSTServer.so /home/server/libSTServer.so COPY --from=builder /home/server/package/bin/SkyrimTogetherServer /home/server/SkyrimTogetherServer COPY --from=builder /home/server/package/bin/crashpad_handler /home/server/crashpad_handler +COPY --from=builder /home/server/build/linux/x64/release/libSTServer.debug /home/server/libSTServer.debug COPY --from=builder /home/server/build/linux/x64/release/SkyrimTogetherServer.debug /home/server/SkyrimTogetherServer.debug WORKDIR /home/server ENTRYPOINT ["./SkyrimTogetherServer"] diff --git a/xmake.lua b/xmake.lua index c0d1df2a8..3ab24d2ee 100644 --- a/xmake.lua +++ b/xmake.lua @@ -67,24 +67,25 @@ task("upload-symbols") config.load() local sentrybin = path.join(os.projectdir(), "build", "sentry-cli.exe") - local file_path = path.join(os.projectdir(), "build", config.get("plat"), config.get("arch"), config.get("mode"), "SkyrimTogether.pdb") - if linux then - file_path = path.join(os.projectdir(), "build", "linux", "x64", "SkyrimTogetherServer.debug") - end - if not os.exists(sentrybin) then http.download("https://github.com/getsentry/sentry-cli/releases/download/2.0.2/sentry-cli-Windows-x86_64.exe", sentrybin) end - - local project = "st-reborn" + if linux then - project = "st-server" - end + -- linux server bins + local file_path = path.join(os.projectdir(), "build", "linux", "x64", "SkyrimTogetherServer.debug") + os.execv(sentrybin, {"--auth-token", key, "upload-dif", "-o", "together-team", "-p", "st-server", file_path}) - os.execv(sentrybin, {"--auth-token", key, "upload-dif", "-o", "together-team", "-p", project, file_path}) + file_path = path.join(os.projectdir(), "build", "linux", "x64", "libSTServer.debug") + os.execv(sentrybin, {"--auth-token", key, "upload-dif", "-o", "together-team", "-p", "st-server", file_path}) + end + -- windows bins if not linux then - local file_path = path.join(os.projectdir(), "build", config.get("plat"), config.get("arch"), config.get("mode"), "SkyrimTogetherServer.pdb") + local file_path = path.join(os.projectdir(), "build", config.get("plat"), config.get("arch"), config.get("mode"), "SkyrimTogether.pdb") + os.execv(sentrybin, {"--auth-token", key, "upload-dif", "-o", "together-team", "-p", "st-reborn", file_path}) + + file_path = path.join(os.projectdir(), "build", config.get("plat"), config.get("arch"), config.get("mode"), "SkyrimTogetherServer.pdb") os.execv(sentrybin, {"--auth-token", key, "upload-dif", "-o", "together-team", "-p", "st-server", file_path}) file_path = path.join(os.projectdir(), "build", config.get("plat"), config.get("arch"), config.get("mode"), "STServer.pdb")