quentinlegot/Toolbox
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request 'Trying to fix report discord task' (#24) from dev into master
All checks were successful
/ build (17, ubuntu-latest) (push) Successful in 4m33s
Details
/ deploy (17, ubuntu-latest) (push) Successful in 6m26s
Details

Browse Source 
Reviewed-on: #24
This commit is contained in:
Quentin Legot 2023-07-26 23:53:11 +02:00
commit be81716cfe
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/test.yml
View File

@ -13,6 +13,8 @@ on:
env: env:
REPO_USERNAME: Altarik REPO_USERNAME: Altarik
REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }} REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
DISCORD_PUB_ID: ${{ secrets.DISCORD_PUB_ID }}
DISCORD_PUB_TOKEN: ${{ secrets.DISCORD_PUB_TOKEN }}
jobs: jobs:
build: build:

2
build.gradle
View File

@ -16,7 +16,7 @@ String webhookId = getEnv("DISCORD_PUB_ID", local.getProperty("discord_pub_id"))
String webhookToken = getEnv("DISCORD_PUB_TOKEN", local.getProperty("discord_pub_token")) String webhookToken = getEnv("DISCORD_PUB_TOKEN", local.getProperty("discord_pub_token"))
String repoUrl = "https://repo.altarik.fr/#/" + (project.version.endsWith('SNAPSHOT') ? 'snapshots/' : 'releases/') + project.group.replace(".", "/") + "/" + project.rootProject.name + "/" + project.version String repoUrl = "https://repo.altarik.fr/#/" + (project.version.endsWith('SNAPSHOT') ? 'snapshots/' : 'releases/') + project.group.replace(".", "/") + "/" + project.rootProject.name + "/" + project.version
var reportConfig = new ReportDiscord.ReportData("https://discord.com/api/", webhookId, webhookToken, "Update " + project.version + " has been published", repoUrl); var reportConfig = new ReportDiscord.ReportData("https://discord.com/api/", webhookId, webhookToken, project.rootProject.name, "Update " + project.version + " has been published", repoUrl);
allprojects { allprojects {
apply plugin: 'maven-publish' apply plugin: 'maven-publish'

5
buildSrc/src/main/java/fr/altarik/ReportDiscord.java
View File

@ -26,7 +26,8 @@ public abstract class ReportDiscord extends DefaultTask {
{ {
"embeds": [ "embeds": [
{ {
"title": "A new update for Toolbox is available", "title": "A new update of\s""" + data.projectName() + """
is available",
"description":\s""" + "\"" + message + "\"" + """ "description":\s""" + "\"" + message + "\"" + """
, ,
"url":\s""" + "\"" + data.url() + "\"" + """ "url":\s""" + "\"" + data.url() + "\"" + """
@ -48,7 +49,7 @@ public abstract class ReportDiscord extends DefaultTask {
} }
} }
public record ReportData(String baseUrl, String webhookId, String webhookToken, String message, String url) { public record ReportData(String baseUrl, String webhookId, String webhookToken, String projectName, String message, String url) {
} }