From d55db6a5bfc8d7f9d776faaea364656f4a0a8aed Mon Sep 17 00:00:00 2001 From: violine1101 Date: Fri, 4 Aug 2023 09:32:15 +0200 Subject: [PATCH 1/3] Fix special security level retrieval (#813) Apparently the config converts every key to lowercase, so let's adjust for that. Might have been caused by some update to the konf library that we missed. --- config/config.yml | 2 +- .../io/github/mojira/arisa/infrastructure/jira/Mappers.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yml b/config/config.yml index 237823cc..9a3f89f7 100644 --- a/config/config.yml +++ b/config/config.yml @@ -36,7 +36,7 @@ arisa: privateSecurityLevel: default: '10318' special: - MCL: '10502' + mcl: '10502' modules: affectedVersionMessage: diff --git a/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt b/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt index 6aa3f975..22221bbe 100644 --- a/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt +++ b/src/main/kotlin/io/github/mojira/arisa/infrastructure/jira/Mappers.kt @@ -58,7 +58,7 @@ fun getCreationDate(issue: JiraIssue, id: String, default: Instant) = issue.chan ?.toInstant() ?: default fun JiraProject.getSecurityLevelId(config: Config) = - config[Arisa.PrivateSecurityLevel.special][key] ?: config[Arisa.PrivateSecurityLevel.default] + config[Arisa.PrivateSecurityLevel.special][key.lowercase()] ?: config[Arisa.PrivateSecurityLevel.default] fun JiraVersion.toDomain() = Version( id, From 404b30626ca501784927a1aaba88925598c54905 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:16:32 +0100 Subject: [PATCH 2/3] Bump jvm from 1.9.0 to 1.9.10 (#815) Bumps [jvm](https://github.com/JetBrains/kotlin) from 1.9.0 to 1.9.10. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.0...v1.9.10) --- updated-dependencies: - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 37a91c4b..8cde7659 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "1.9.10" id("org.jlleitschuh.gradle.ktlint") version "11.5.0" application id("io.gitlab.arturbosch.detekt") version "1.23.0" From aa3ea16b4196eae0d42762313327ca85a3580986 Mon Sep 17 00:00:00 2001 From: Uriel Salischiker Date: Sat, 16 Mar 2024 11:12:19 +0100 Subject: [PATCH 3/3] Transfer whole files via rsync --- .github/workflows/push-build-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-build-deploy.yml b/.github/workflows/push-build-deploy.yml index c3274830..7fde75b7 100644 --- a/.github/workflows/push-build-deploy.yml +++ b/.github/workflows/push-build-deploy.yml @@ -28,7 +28,7 @@ jobs: DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }} SERVER_PORT: 50022 FOLDER: "build/install/arisa-kt/lib" - ARGS: "-avh --delete" + ARGS: "-avhW --delete" SERVER_IP: localhost USERNAME: arisakt SERVER_DESTINATION: /home/arisakt/arisa-kt @@ -44,7 +44,7 @@ jobs: DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }} SERVER_PORT: 50022 FOLDER: "build/install/arisa-kt/bin" - ARGS: "-avh --delete" + ARGS: "-avhW --delete" SERVER_IP: localhost USERNAME: arisakt SERVER_DESTINATION: /home/arisakt/arisa-kt @@ -60,7 +60,7 @@ jobs: DEPLOY_KEY: ${{ secrets.SSH_PRIVATE_KEY }} SERVER_PORT: 50022 FOLDER: "config" - ARGS: "-avh --delete --exclude='local.yml'" + ARGS: "-avhW --delete --exclude='local.yml'" SERVER_IP: localhost USERNAME: arisakt SERVER_DESTINATION: /home/arisakt/arisa-kt