From d16dfcfebd103574ed5f380a80d5096ffa010987 Mon Sep 17 00:00:00 2001 From: Emotion Date: Tue, 14 Mar 2023 00:34:54 +1300 Subject: [PATCH 1/3] Updated REAMEME.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2799420..4954a58 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-) -![](https://cdn.discordapp.com/attachments/765441543100170271/914327948667011132/Ellie_Concept_2_transparent_ver.png?size=2048) + ## Badges @@ -37,7 +37,7 @@ Please read our [code of conduct](CODE_OF_CONDUCT.md) before contributing This bot is in an early alpha stage and any help is very much appreciated -Also please only push changes to the [Development Branch](https://github.com/EllieBotDevs/Ellie-bot/tree/development) +Also, please only push changes to the [staging Branch](https://github.com/EllieBotDevs/Ellie-bot/tree/staging) ## Discord Server @@ -50,7 +50,7 @@ If you would like to see our progress you can view our [changelog](CHANGELOG.md) ## Licence ``` -Copyright 2022 EllieBotDevs +Copyright 2023 EllieBotDevs Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From e70bdead02b935202d2daf89fccd06b655f582a3 Mon Sep 17 00:00:00 2001 From: Emotion Date: Tue, 14 Mar 2023 00:47:29 +1300 Subject: [PATCH 2/3] Deleted codeql-analysis.yml as it was outdated --- .github/workflows/codeql-analysis.yml | 92 --------------------------- 1 file changed, 92 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index e7dc58a..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,92 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ main ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ main ] - schedule: - - cron: '26 21 * * 5' - -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' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Setup Node.js environment - uses: actions/setup-node@v2.4.1 - with: - # Set always-auth in npmrc - always-auth: # optional, default is false - # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 - node-version: 16.x - # Target architecture for Node to use. Examples: x86, x64. Will use system architecture by default. - architecture: # optional - # Set this option if you want the action to check for the latest available version that satisfies the version spec - check-latest: # optional - # Optional registry to set up for auth. Will set the registry in a project level .npmrc and .yarnrc file, and set up auth to read in from env.NODE_AUTH_TOKEN - registry-url: # optional - # Optional scope for authenticating against scoped registries - scope: # optional - # Used to pull node distributions from node-versions. Since there's a default, this is typically not supplied by the user. - token: # optional, default is ${{ github.token }} - # Used to specify a package manager for caching in the default directory. Supported values: npm, yarn, pnpm - cache: # optional - # Used to specify the path to a dependency file: package-lock.json, yarn.lock, etc. Supports wildcards or a list of file names for caching multiple dependencies. - cache-dependency-path: # optional - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - 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 - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 From 7ae281ada8639656fdd74ca4face4b51197d04c4 Mon Sep 17 00:00:00 2001 From: Emotion Date: Tue, 14 Mar 2023 00:50:38 +1300 Subject: [PATCH 3/3] Added codeql-analysis.yml as I have updated it to use java instead of JavaScript --- .github/workflows/codeql-analysis.yml | 76 +++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..79bc2ea --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,76 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "main" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "main" ] + schedule: + - cron: '16 18 * * 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' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/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. + + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, 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@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}"