From a6ec1596811fdc268f5d7a1741b837ef50ec4f26 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:43:41 +0100 Subject: [PATCH 01/15] Update maven.yml --- .github/workflows/maven.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5d84355..6831a2e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,9 +9,25 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 1.13 uses: actions/setup-java@v1 with: java-version: 1.13 - name: Build with Maven run: mvn -B package --file pom.xml + - name: Copy folder content recursively to remote + uses: garygrossgarten/github-action-scp@release + with: + local: ./target/Hadder-Build.jar + remote: /home/Bots/Hadder-Build.jar + host: ${{ secrets.HOST }} + username: ${{ secrets.SSH_USER }} + password: ${{ secrets.PASSWORD }} + - name: executing remote ssh commands using password + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + port: ${{ secrets.PORT }} + script: /home/Bots/deploy.sh -- 2.45.3 From 33a74d58ccc8ec972aa5f59c96b83fc15b88ddea Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:51:55 +0100 Subject: [PATCH 02/15] Update maven.yml --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6831a2e..ad43714 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,7 +21,7 @@ jobs: local: ./target/Hadder-Build.jar remote: /home/Bots/Hadder-Build.jar host: ${{ secrets.HOST }} - username: ${{ secrets.SSH_USER }} + username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master -- 2.45.3 From 67e8017f68b339672ee87b3d1a56d73d5ade82b2 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:55:30 +0100 Subject: [PATCH 03/15] Update maven.yml --- .github/workflows/maven.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ad43714..26c3eea 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,4 +30,15 @@ jobs: username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh + script: /home/Bots/deploy.sh + - name: Send Webhook Notification + if: always() + env: + JOB_STATUS: ${{ job.status }} + WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} + HOOK_OS_NAME: ${{ runner.os }} + WORKFLOW_NAME: ${{ github.workflow }} + run: | + git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook + bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL + shell: bash -- 2.45.3 From 59a3eee5bf761816c6adb991d5f8ce62747cb7e1 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 21:59:51 +0100 Subject: [PATCH 04/15] Update maven.yml --- .github/workflows/maven.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 26c3eea..6d69b82 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,6 +15,8 @@ jobs: java-version: 1.13 - name: Build with Maven run: mvn -B package --file pom.xml + - name: Build Final Jar + run: mvn clean compile assembly:single - name: Copy folder content recursively to remote uses: garygrossgarten/github-action-scp@release with: -- 2.45.3 From bfc2022387a51723bb4369d120cf4abca384c044 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:03:27 +0100 Subject: [PATCH 05/15] Update maven.yml --- .github/workflows/maven.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6d69b82..b133824 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,7 +6,6 @@ jobs: build: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v1 - name: Set up JDK 1.13 -- 2.45.3 From 9f9cbf5a1b56958e6c0647f2cd6ba48e74c2cfa2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:13:58 +0100 Subject: [PATCH 06/15] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 40e2235..dc932a7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ # Hadder + + + -- 2.45.3 From a14188af8a1cd0193ad86bda086fb49f2b31a734 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:22:32 +0100 Subject: [PATCH 07/15] Update maven.yml --- .github/workflows/maven.yml | 85 ++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b133824..1fe03d9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,45 +1,50 @@ -name: Java CI +name: Hadder on: [push] jobs: - build: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.13 + uses: actions/setup-java@v1 + with: + java-version: 1.13 + - name: Build with Maven + run: mvn -B package --file pom.xml - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.13 - uses: actions/setup-java@v1 - with: - java-version: 1.13 - - name: Build with Maven - run: mvn -B package --file pom.xml - - name: Build Final Jar - run: mvn clean compile assembly:single - - name: Copy folder content recursively to remote - uses: garygrossgarten/github-action-scp@release - with: - local: ./target/Hadder-Build.jar - remote: /home/Bots/Hadder-Build.jar - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - - name: executing remote ssh commands using password - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} - script: /home/Bots/deploy.sh - - name: Send Webhook Notification - if: always() - env: - JOB_STATUS: ${{ job.status }} - WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} - HOOK_OS_NAME: ${{ runner.os }} - WORKFLOW_NAME: ${{ github.workflow }} - run: | - git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook - bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL - shell: bash + deploy: + runs-on: ubuntu-latest + needs: test + if: github.ref == 'refs/heads/master' + steps: + - name: Build Final Jar + run: mvn clean compile assembly:single + - name: Copy folder content recursively to remote + uses: garygrossgarten/github-action-scp@release + with: + local: ./target/Hadder-Build.jar + remote: /home/Bots/Hadder-Build.jar + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + - name: executing remote ssh commands using password + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + port: ${{ secrets.PORT }} + script: /home/Bots/deploy.sh + - name: Send Webhook Notification + if: always() + env: + JOB_STATUS: ${{ job.status }} + WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }} + HOOK_OS_NAME: ${{ runner.os }} + WORKFLOW_NAME: ${{ github.workflow }} + run: | + git clone https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook + bash webhook/send.sh $JOB_STATUS $WEBHOOK_URL + shell: bash -- 2.45.3 From ef6ca161130fc1e9625cf59df70067fc7e6f8bb8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:22:51 +0100 Subject: [PATCH 08/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc932a7..973a73b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder - +[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github/BigBotNetwork/Hadder) -- 2.45.3 From 6f974cd314a32beb5bd7e93a68d9caa83a30769e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:23:58 +0100 Subject: [PATCH 09/15] .com --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 973a73b..d9e474a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github/BigBotNetwork/Hadder) +[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github.com/BigBotNetwork/Hadder) -- 2.45.3 From 3dbecc7ee6fbf1dd6de76512ab85bd61f1865ae5 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:28:14 +0100 Subject: [PATCH 10/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9e474a..d18a179 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Java%20CI/badge.svg)](https://github.com/BigBotNetwork/Hadder) +[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) -- 2.45.3 From 4395bc83dc7fe6e700a56945413874b88d75a1f4 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:28:57 +0100 Subject: [PATCH 11/15] Update maven.yml --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1fe03d9..cf1cf36 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,7 +6,6 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - name: Set up JDK 1.13 uses: actions/setup-java@v1 with: @@ -19,6 +18,7 @@ jobs: needs: test if: github.ref == 'refs/heads/master' steps: + - uses: actions/checkout@v1 - name: Build Final Jar run: mvn clean compile assembly:single - name: Copy folder content recursively to remote -- 2.45.3 From 1fc4248eb9497b80842aeab45e905c76b0ef5a68 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:30:30 +0100 Subject: [PATCH 12/15] Update maven.yml --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cf1cf36..25e641a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -6,6 +6,7 @@ jobs: test: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v1 - name: Set up JDK 1.13 uses: actions/setup-java@v1 with: -- 2.45.3 From 270aeba086cacbafbedfc81688bc4fb6d56c5ef9 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:35:13 +0100 Subject: [PATCH 13/15] Update maven.yml --- .github/workflows/maven.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 25e641a..aaeb397 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,6 +20,10 @@ jobs: if: github.ref == 'refs/heads/master' steps: - uses: actions/checkout@v1 + - name: Set up JDK 1.13 + uses: actions/setup-java@v1 + with: + java-version: 1.13 - name: Build Final Jar run: mvn clean compile assembly:single - name: Copy folder content recursively to remote -- 2.45.3 From 066db1e17ae7efe1141216626a13bf4550a773ed Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:38:51 +0100 Subject: [PATCH 14/15] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d18a179..2e10a76 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Hadder +Hadder is the best discord bot + [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) -- 2.45.3 From 07553d6753af21eacc334727f6e8d9265fc7fadb Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 16 Nov 2019 22:40:07 +0100 Subject: [PATCH 15/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e10a76..a78d7e1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hadder -Hadder is the best discord bot +The Hadder Discord bot is a multi-purpose Discord Bot. [![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder) -- 2.45.3