Merge pull request #449 from beanbeanjuice/integration

Ready for Integration

.github/pull_request_template.md

@@ -34,7 +34,7 @@ Fixes # (issue)
 - [ ] Appropriate changes have been made to the `README.md` file.
 - [ ] No warnings are produced when the code is run.
 - [ ] Appropriate tests exist for this pull request.
-- [ ] New and existing Gradle CI tests have passed.
+- [ ] New and existing Maven CI tests have passed.
 - [ ] The pull request is properly merging into the correct branch.
 - [ ] All existing local code has been pushed to the GitHub repository.
 - [ ] Changes have been documented in the current draft [cafeBot Releases](https://github.com/beanbeanjuice/cafeBot/releases) update.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,87 @@
+name: "CodeQL and Gradle CI"
+
+on:
+  push:
+    branches: [ master, integration ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, integration ]
+  schedule:
+    - cron: '26 12 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    # - name: Autobuild
+    #   uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    - name: Set up JDK 16
+      uses: actions/setup-java@v3
+      with:
+        java-version: '16'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      env:
+        CAFEBOT_MYSQL_URL: ${{ secrets.CAFEBOT_MYSQL_URL }}
+        CAFEBOT_MYSQL_PORT: ${{ secrets.CAFEBOT_MYSQL_PORT }}
+        CAFEBOT_MYSQL_USERNAME: ${{ secrets.CAFEBOT_MYSQL_USERNAME }}
+        CAFEBOT_MYSQL_PASSWORD: ${{ secrets.CAFEBOT_MYSQL_PASSWORD }}
+        CAFEBOT_MYSQL_ENCRYPT: ${{ secrets.CAFEBOT_MYSQL_ENCRYPT }}
+
+        CAFEBOT_VERSION: ${{ secrets.CAFEBOT_VERSION }}
+        CAFEBOT_TOKEN: ${{ secrets.CAFEBOT_TOKEN }}
+        CAFEBOT_GUILD_ID: ${{ secrets.CAFEBOT_GUILD_ID }}
+        CAFEBOT_GUILD_LOG_CHANNEL_ID: ${{ secrets.CAFEBOT_GUILD_LOG_CHANNEL_ID }}
+        CAFEBOT_GUILD_WEBHOOK_URL: ${{ secrets.CAFEBOT_GUILD_WEBHOOK_URL }}
+
+        CAFEBOT_SPOTIFY_ID: ${{ secrets.CAFEBOT_SPOTIFY_ID }}
+        CAFEBOT_SPOTIFY_SECRET: ${{ secrets.CAFEBOT_SPOTIFY_SECRET }}
+
+        CAFEBOT_TWITCH_ACCESS_TOKEN: ${{ secrets.CAFEBOT_TWITCH_ACCESS_TOKEN }}
+
+        CAFEBOT_TOPGG_ID: ${{ secrets.CAFEBOT_TOPGG_ID }}
+        CAFEBOT_TOPGG_TOKEN: ${{ secrets.CAFEBOT_TOPGG_TOKEN }}
+        CAFEBOT_SPRING_BOOT_PORT: ${{ secrets.CAFEBOT_SPRING_BOOT_PORT }}
+        API_PASSWORD: ${{ secrets.API_PASSWORD }}
+        RELEASE_API_PASSWORD: ${{ secrets.RELEASE_API_PASSWORD }}
+      run: mvn test
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/integreation-maven-workflow.yml

@@ -0,0 +1,18 @@
+name: Maven CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 16
+        uses: actions/setup-java@v3
+        with:
+          java-version: '16'
+          distribution: 'adopt'
+          cache: maven
+      - name: Test with Maven
+        run: mvn test

.github/workflows/lines-of-code.yml

@@ -0,0 +1,14 @@
+name: Count Lines of Code
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install cloc
+        run: sudo apt-get install cloc
+      - name: Run cloc
+        run: cloc .

.gitignore

@@ -19,6 +19,9 @@
 *.tar.gz
 *.rar
 
+# Maven
+/target/
+
 # Gradle
 /build/
 /.gradle/