Run workflows on 'main' and 'develop' branches

Author: joelvaneenwyk

Diff for: .github/workflows/codeql.yml

@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [main, develop, master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [main, develop, master]
   schedule:
-    - cron: '19 2 * * 5'
+    - cron: "19 2 * * 5"
 
 jobs:
   analyze:
@@ -32,39 +32,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'csharp' ]
+        language: ["csharp"]
         # 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@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    # 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
+      # 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
+      # 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
+      # ℹ️ 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
+      # ✏️ 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
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

Diff for: .github/workflows/main.yml

@@ -5,7 +5,9 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
+    branches: [main, develop, master]
+  pull_request:
+    branches: [main, develop, master]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -21,37 +23,36 @@ jobs:
     steps:
       - name: Check Commit and Install 7Zip PowerShell Module
         shell: powershell
-        
+
         run: |
           # cancel early, if not build commit
           $strVal ='${{ github.event.commits[0].message }}'
           # Convert commit message to a single line if multiline
           $singleLineStrVal = $strVal -replace "`r`n", " " -replace "`n", " "
-          if($singleLineStrVal -match '#GITBUILD') 
+          if($singleLineStrVal -match '#GITBUILD')
           {
                 Write-Host 'True'
           } else {
                 Write-Host 'False'
                 exit(1)
           }
-          Install-Module 7Zip4PowerShell -Force -Verbose 
+          Install-Module 7Zip4PowerShell -Force -Verbose
       - uses: actions/checkout@v2
-      
       - name: Restore NuGet packages
         run: nuget restore UnityLauncherPro.sln
-      
+
       - name: Build Binary
         shell: cmd
-        run: call .\Build.cmd      
-        
+        run: call .\Build.cmd
+
       - name: Build Artifact
         shell: cmd
         run: call .\ArtifactBuild.cmd
 
       - name: Get current date and time
         id: datetime
         run: echo "::set-output name=current_datetime::$(date +'%d/%m/%Y %H:%M')"
-        
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@latest
@@ -63,8 +64,8 @@ jobs:
           body: |
             Automated Release by GitHub Action CI
           draft: false
-          prerelease: false      
-        
+          prerelease: false
+
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
@@ -75,4 +76,3 @@ jobs:
           asset_path: ./UnityLauncherPro.zip
           asset_name: UnityLauncherPro.zip
           asset_content_type: application/zip
-