From 5653d63f2d38b7507db95ee088e324cae9348288 Mon Sep 17 00:00:00 2001 From: Miniontoby <tobias.gaarenstroom@gmail.com> Date: Wed, 9 Mar 2022 16:46:29 +0100 Subject: [PATCH] Version 1.1.0 --- .github/workflows/deploy-release.yaml | 34 ++++++++++++++++++ .gitlab-ci.yml | 29 ++------------- {target => builds}/discordaction-1.0.0.jar | Bin 14289 -> 14406 bytes builds/discordaction-1.1.0.jar | Bin 0 -> 14512 bytes ci_settings.xml | 2 +- pom.xml | 14 ++++++-- .../discordaction/DiscordAction.java | 19 ++++++---- .../discordaction/DiscordWebhook.java | 0 .../discordaction/DiscordAction.class | Bin 3322 -> 3517 bytes target/discordaction-1.1.0.jar | Bin 0 -> 14512 bytes target/maven-archiver/pom.properties | 4 +-- .../compile/default-compile/inputFiles.lst | 4 +-- 12 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 .github/workflows/deploy-release.yaml rename {target => builds}/discordaction-1.0.0.jar (61%) create mode 100644 builds/discordaction-1.1.0.jar rename src/main/java/com/{stream_pi => miniontoby}/discordaction/DiscordAction.java (77%) rename src/main/java/com/{stream_pi => miniontoby}/discordaction/DiscordWebhook.java (100%) create mode 100644 target/discordaction-1.1.0.jar diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml new file mode 100644 index 0000000..bbfcb2e --- /dev/null +++ b/.github/workflows/deploy-release.yaml @@ -0,0 +1,34 @@ +name: Build Release + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" + + steps: + - uses: actions/checkout@v1 + + - name: Build and Test + uses: qcastel/github-actions-maven-cmd@master + with: + maven-args: "clean install" + + - name: Release + uses: qcastel/github-actions-maven-release@master + env: + JAVA_HOME: /usr/lib/jvm/java-11-openjdk/ + with: + git-release-bot-name: "bot-idhub" + git-release-bot-email: "bot@idhub.io" + version-minor: true + maven-development-version-number: ${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}-SNAPSHOT + maven-release-version-number: ${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.0 + + + maven-args: "-Dmaven.javadoc.skip=true -DskipTests -DskipITs -Dmaven.deploy.skip=true" + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8728f0b..0004d07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,33 +1,12 @@ -# This file is a template, and might need editing before it works on your project. -# To contribute improvements to CI/CD templates, please follow the Development guide at: -# https://docs.gitlab.com/ee/development/cicd/templates.html -# This specific template is located at: -# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Maven.gitlab-ci.yml - # Build JAVA applications using Apache Maven (http://maven.apache.org) -# For docker image tags see https://hub.docker.com/_/maven/ -# -# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html - -# This template will build and test your projects -# * Caches downloaded dependencies and plugins between invocation. -# * Verify but don't deploy merge requests. -# * Deploy built artifacts from master branch only. variables: - # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log. - # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" - # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used - # when running from the command line. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" + MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.test.skip" -# This template uses jdk11 for verifying and deploying images image: maven:3-jdk-11 -# Cache downloaded dependencies and plugins between builds. -# To keep cache across branches add 'key: "$CI_JOB_NAME"' cache: paths: - .m2/repository @@ -46,17 +25,13 @@ cache: verify:jdk11: <<: *verify -# To deploy packages from CI, create a ci_settings.xml file -# For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for more details. -# Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate. -# For `master` branch run `mvn deploy` automatically. build:jdk11: stage: build script: - if [ ! -f ci_settings.xml ]; then echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for instructions."; fi - - 'mvn $MAVEN_CLI_OPTS clean -Dmaven.test.skip package -s ci_settings.xml' + - 'mvn $MAVEN_CLI_OPTS clean package -s ci_settings.xml' only: variables: - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH diff --git a/target/discordaction-1.0.0.jar b/builds/discordaction-1.0.0.jar similarity index 61% rename from target/discordaction-1.0.0.jar rename to builds/discordaction-1.0.0.jar index 092104f4444ad98dc25648b17758ffc075f4da8e..e4385fd45be3affd224f2be8121d737d8f757a82 100644 GIT binary patch delta 3375 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 delta 3246 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 diff --git a/builds/discordaction-1.1.0.jar b/builds/discordaction-1.1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..893dd1aa910d063286c18069c1a51ab9c07d7a23 GIT binary patch literal 14512 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 Q<RKyh)}Ox`>0kc)e~I?$RR910 literal 0 HcmV?d00001 diff --git a/ci_settings.xml b/ci_settings.xml index 8e93095..8340080 100644 --- a/ci_settings.xml +++ b/ci_settings.xml @@ -7,7 +7,7 @@ <httpHeaders> <property> <name>Job-Token</name> - <value>com.stream_pi.discordaction</value> + <value>com.miniontoby.discordaction</value> </property> </httpHeaders> </configuration> diff --git a/pom.xml b/pom.xml index aeddf2c..5c6b763 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.stream-pi</groupId> + <groupId>com.miniontoby</groupId> <artifactId>discordaction</artifactId> - <version>1.0.0</version> + <version>1.1.0</version> + + <distributionManagement> + <repository> + <id>github</id> + <name>Github</name> + <url>https://maven.pkg.github.com/Miniontoby/DiscordAction</url> + </repository> + </distributionManagement> <build> <plugins> @@ -42,6 +50,8 @@ <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <JavaFXVersion>16-ea+5</JavaFXVersion> + <github.global.server>github</github.global.server> + <project.scm.id>github</project.scm.id> </properties> <dependencies> diff --git a/src/main/java/com/stream_pi/discordaction/DiscordAction.java b/src/main/java/com/miniontoby/discordaction/DiscordAction.java similarity index 77% rename from src/main/java/com/stream_pi/discordaction/DiscordAction.java rename to src/main/java/com/miniontoby/discordaction/DiscordAction.java index 1d5cae4..3c5f5eb 100644 --- a/src/main/java/com/stream_pi/discordaction/DiscordAction.java +++ b/src/main/java/com/miniontoby/discordaction/DiscordAction.java @@ -30,13 +30,16 @@ public class DiscordAction extends NormalAction { Property usernameProperty = new StringProperty("username"); usernameProperty.setDisplayName("Webhook Username"); + Property contentProperty = new StringProperty("content"); + contentProperty.setDisplayName("Message Content"); + Property titleProperty = new StringProperty("title"); - titleProperty.setDisplayName("Webhook Title"); + titleProperty.setDisplayName("Embed Title"); - Property contentProperty = new StringProperty("content"); - contentProperty.setDisplayName("Webhook Text Content"); + Property descriptionProperty = new StringProperty("description"); + descriptionProperty.setDisplayName("Embed Description"); - addClientProperties(webhookURLProperty, usernameProperty, titleProperty, contentProperty); + addClientProperties(webhookURLProperty, usernameProperty, contentProperty, titleProperty, descriptionProperty); } @Override @@ -46,9 +49,10 @@ public class DiscordAction extends NormalAction { public void sendMessage() throws MinorException { String webhookURL = getClientProperties().getSingleProperty("webhook_url").getStringValue(); - String webhookTitle = getClientProperties().getSingleProperty("title").getStringValue(); String webhookUser = getClientProperties().getSingleProperty("username").getStringValue(); String webhookContent = getClientProperties().getSingleProperty("content").getStringValue(); + String webhookEmbedTitle = getClientProperties().getSingleProperty("title").getStringValue(); + String webhookEmbedDescription = getClientProperties().getSingleProperty("description").getStringValue(); if (webhookURL.isBlank()) { throwMinorException("No Discord Webhook URL specified!"); @@ -56,10 +60,11 @@ public class DiscordAction extends NormalAction { DiscordWebhook webhook = new DiscordWebhook(webhookURL); webhook.setUsername(webhookUser); + webhook.setContent(webhookContent); DiscordWebhook.EmbedObject embed = new DiscordWebhook.EmbedObject(); - embed.setTitle(webhookTitle); - embed.setDescription(webhookContent); + embed.setTitle(webhookEmbedTitle); + embed.setDescription(webhookEmbedDescription); try { webhook.addEmbed(embed); diff --git a/src/main/java/com/stream_pi/discordaction/DiscordWebhook.java b/src/main/java/com/miniontoby/discordaction/DiscordWebhook.java similarity index 100% rename from src/main/java/com/stream_pi/discordaction/DiscordWebhook.java rename to src/main/java/com/miniontoby/discordaction/DiscordWebhook.java diff --git a/target/classes/com/stream_pi/discordaction/DiscordAction.class b/target/classes/com/stream_pi/discordaction/DiscordAction.class index c9e56ad7431cac9e229d96fb588cb9aa89505e14..6674f3a1aaa6dda2828f8e88c308491c3cc939c7 100644 GIT binary patch delta 1486 zcmZWp>vI!T6#s2Dn|rg_wvg)JwkknNQ<6SnOACaD+6Pf=YHfg+irOaKLWCwY8!Yv; z-~+7+7FW?$5#KnYUl?b$GgkcQ2S4Z^;EaQx{R5oQ8S&grY%^mfd(J)Qo^$T+{O;NP zOTXT1{q)awKLFT?t19ls5stKq7#<NK!!a)OqZ~(tevIRBp`T!wP!YhSFtQ9ejwu!O zFgT`FG~*b@agIF4lN={FPIAm}6gY|uvm)gwAxc7+>KMv6C6b<2k-{9uY2lw|ct%AF z3?ZHs;yH%rRkY!V5HAQ}3HKQx&N95Hq7yGMyv*>*#UKAT(2y$@%0{6)S}M*OrSiOl zx^ljJ(pa|}rwlV!%FmYb#lpH*9Xg#eT%XBs&i-ARutz<c+c(Y`+2h6HiJ_USF?C23 zlCY`PH@IHRp7DGwy=v=n%ieDENMM6`GgmB4X?P6_8eYeO1T~p2(7EMec3#69!V{RD z%yvxu7x^X@?0GpRpC|o|9Om7)py4en+P}(UR<|3Ut{@5>9vjwhQMmXi(<l`tX9(Md zwcRxrt1=>?A!(TA<S`>OP~k{|;&MYE-2Ot<1_Lz=N!VD~8#J^v+9d3@JK63n8s3Jj zVE{cE-od*Jmo&VG_cbhGS;GhT(EiigDqp5vLP}TQBf-KI0l3fp#nX3-hL7=yhEIj~ z44-TG0zLK><u>1!SeCGzVzz#JL;1}UP)(y;g=~M%e{PJ?yo#R}5{PM%JM7E;eyP{K z;SY!VXh$O-C~7BmktVnl<-rbG{|yB`(x%<1_U~IoeI}@{U_)Hdm0**DV1!>sb4HG) zGT!!7M(Idpe7ZN4VY-rXaQijN^q`kyH#GZ_y3I<`KpsK_B}5@k-e0L+Jy}H_aqJ-k zO~_y`tvnR_0QS*Jre_z$@1Z`DXvICWQgAQT5PjW8PyZTf(WB@{i8#1p9fS(YL*6dR zh`Fa%`c|r^*VdvtsxTmZMJM|yYnf`@8EkN{*+FR7H5w~M(lu_a7$dH+sba*vuBBHk zC2Bd?vIKu5c$b5%t7yqYSFkPa(|zp@T6JHCgYYWaGAq~~XFAip4kBsNii2oc_vy?* zyY6$)aTWD(9?`jjE-G}5nziWlxIpi=?9x4gMuOafI=aLr@`S0~UTV`Cpu0Ut9FG#G z<HY6!@i<NF6^Xq$noJ7^a1IG7c96>5k40jC2@kq#9VH$X=^4ZjxL~BpTOH0*R)Rn@ z;SA*@h`BIK%1pR$462nN&IgdTs8oWkZJaJ{n6A-B2S+i2hruvLCHF(VN!WZ0F@{v_ oAGk@7`TsW<S{MzL#L%hMjDv^9Obp*)DhH?pu8qEc@<Z_d3sci0NB{r; delta 1286 zcmZ8hYjYD-7=Ct>&DoxAiUN*qD%up<K+>2{C_=1?4HqwMl?1G@2u;#O($b_fp|n;F zRS>)j>kSdVI(~9G&Mc!0{s6}>`UCs}`V0JEeNNIw#%%UIdEWD0p7%MMz0>)(UH|2u zpMD1LD87++1V>C{B;v>_bJWB!wZ3R#Osy}O$f@;ZfpLj;99Q5KffFW9N_1etL|(#1 z!9>x-qzT8wDHE@nI4w|8!BfgiD|1F-24#uEHYyUMm^E=$`R4?x65W_krY3Msq6bHm znOEk#axW;eDDav@3`+v93%qglw?B<wtyDYXu4r32<iUlaGg~WF%2k0kU0t6DTIZd@ z=}Kk#C}SLVLJzy&>)&a0H|N_nm_Sm4I8dq<D|3?;E@0WhTUgd0M@nTDsZ|P#7T#8# z_EY&nd~!YVB9`4BeM#RXu7CL=W&-b6xQr`qr$19qG~&maZM%+ThAq6ST;{o|Ggr>f zI2!J0?Y3No8iHHF^{obB(kqgOQ?6;)+}d##YF+7d_r79fCQ+@;Ir*8Bv!z7dy(yw$ z3-9553r`|x;RAdq@R5a&@ri}2xMsn{r*6jR4Sc3(Mcoa)sA=JI1@;i^*=*qpd}-mj zGGF0_g|CrxSB(b(H*rnF4#sT#VSnHc-Ho;Vx+%`bM}7RzKtXADx>62l{qBg2M0Rn< zq7T@K-5B7?CXCXFf!|^90*<>k<WO%^+<~3*#j-hnUp8mNv$=rn&w2>0FhoZ`Z4}ZC zwfEG=u^p=P?q>R0X^9LU=)G(a!VvcHm(GlSr1;B+#}MYdmqZ7dspvk=`-v8rT||ng z5%tjdUrWg%Kpzw0jh1SfI-}Nl-d&4wHwV*}*w19zCDwXy;|32~JUleq0QWV)NCRwY zg3$)JzX?+Qn1_e2qb<6z%R~4!x^uBx*qSnIBkp0_ZS>^ox6qpk*nvI|kujSpdDuQ? z8+O3M4%_e${T3Z55w(Q}hJ;s0c?$Db<p0Lk(D4xNCA%boJcbZG5so&%YmkSdlpCgI z8KQA&RG>yvcnW8^GmnF;lCEP32XGOG8j55%>Jr+ppFu(my(Uc%3rtC~c?i>tPg9%- zPOwCpGzRbj^V8IIm<<o(X-YcI<9dcTfDzW=p{=rjArKcBZGC~&G--<exdplf-xQia ZOx|_EI-X}Koz0%(DoLh?Z;@xw_Adh|<5~a! diff --git a/target/discordaction-1.1.0.jar b/target/discordaction-1.1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..893dd1aa910d063286c18069c1a51ab9c07d7a23 GIT binary patch literal 14512 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 Q<RKyh)}Ox`>0kc)e~I?$RR910 literal 0 HcmV?d00001 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 73e2c08..3e0e1b8 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,4 +1,4 @@ #Created by Apache Maven 3.8.4 -groupId=com.stream-pi +groupId=com.miniontoby artifactId=discordaction -version=1.0.0 +version=1.1.0 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index f00f2ff..49a4fed 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -/home/pi/discordaction/src/main/java/com/stream_pi/discordaction/DiscordAction.java /home/pi/discordaction/src/main/java/module-info.java -/home/pi/discordaction/src/main/java/com/stream_pi/discordaction/DiscordWebhook.java +/home/pi/discordaction/src/main/java/com/miniontoby/discordaction/DiscordAction.java +/home/pi/discordaction/src/main/java/com/miniontoby/discordaction/DiscordWebhook.java -- GitLab