Delete codeql-analysis.yml

.github/workflows/codeql-analysis.yml

@@ -1,71 +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: '23 16 * * 4'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # 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
-
-    # 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

.github/workflows/dev.yml

@@ -25,6 +25,9 @@ jobs:
             - name: Install Electron-Builder
               run: npm install -g electron-builder
 
+            - name: Replace the version number
+              run: cat src/utils.ts | sed -e 's/[[:digit:]]\.[[:digit:]]\.[[:digit:]]/DEV/g' | tee src/utils.ts > /dev/null
+
             - name: Build
               run: npm run build && electron-builder --linux zip && electron-builder --arm64 --linux zip
 
@@ -56,6 +59,9 @@ jobs:
             - name: Install Electron-Builder
               run: npm install -g electron-builder
 
+            - name: Replace the version number
+              run: cat src/utils.ts | sed -e 's/[[:digit:]]\.[[:digit:]]\.[[:digit:]]/DEV/g' | tee src/utils.ts > /dev/null
+
             - name: Build
               run: npm run build && electron-builder --macos zip
               env:
@@ -84,6 +90,9 @@ jobs:
             - name: Install Electron-Builder
               run: npm install -g electron-builder
 
+            - name: Replace the version number
+              run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts
+
             - name: Build
               run: npm run build && electron-builder --windows zip
 
@@ -121,23 +130,20 @@ jobs:
               with:
                   name: ArmCordLinuxArm64.zip
                   path: linux
-            - run: |
+
-                ls
-                ls windows
-                ls macos
-                ls linux
             - name: Get some values needed for the release
               id: vars
               shell: bash
               run: |
                 echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
             - uses: dev-drprasad/delete-tag-and-release@v0.2.0
               with:
                 delete_release: true
                 tag_name: devbuild
-                repo: ArmCord/ArmCord
               env:
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
             - name: Create the release
               uses: softprops/action-gh-release@v1
               env:

src/content/splash.html

@@ -22,20 +22,25 @@
             text.innerHTML = "You appear to be offline. Please connect to the internet and try again.";
         } else {
             text.innerHTML = "Starting ArmCord...";
-            fetch("https://armcord.xyz/latest.json")
+            if (window.armcord.version === "DEV") {
-                .then((response) => response.json())
+                console.log("Running a development build of ArmCord. Skipping updater.");
-                .then((data) => {
+            } else {
-                    if (data.version !== window.armcord.version) {
+                fetch("https://armcord.xyz/latest.json")
-                        var elem = document.createElement("img");
+                    .then((response) => response.json())
-                        elem.classList.add("logo");
+                    .then((data) => {
-                        elem.src = "https://armcord.smartfridge.space/update.webp";
+                        if (data.version !== window.armcord.version) {
-                        document.body.prepend(elem);
+                            var elem = document.createElement("img");
-                        document.getElementById("splashscreen-armcord").remove();
+                            elem.classList.add("logo");
-                        text.innerHTML = "A new version of ArmCord is available. Please update to the latest version.";
+                            elem.src = "https://armcord.smartfridge.space/update.webp";
-                    } else {
+                            document.body.prepend(elem);
-                        console.log("ArmCord is up to date.");
+                            document.getElementById("splashscreen-armcord").remove();
-                    }
+                            text.innerHTML =
-                });
+                                "A new version of ArmCord is available. Please update to the latest version.";
+                        } else {
+                            console.log("ArmCord is up to date.");
+                        }
+                    });
+            }
             setTimeout(() => {
                 window.armcordinternal.splashEnd();
                 switch (window.armcord.channel) {