Merge branch '0xERR0R:main' into dev-bld

.github/workflows/codeql-analysis.yml

@@ -1,67 +1,38 @@
-# 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 ]
+    branches: 
+      - main
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: 
+      - main
   schedule:
     - cron: '33 15 * * 1'
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # 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@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@v2
-
-    # ℹ️ 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@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Use Golang cache
+      - name: Setup Golang
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: go
+
+      - name: Build with Makefile
+        run: make build
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/delete-workflow-runs.yml

@@ -0,0 +1,37 @@
+name: Delete workflow runs
+
+on:
+  schedule:
+    - cron: '0 0 1 * *'
+  workflow_dispatch:
+
+jobs:
+  del_runs:
+    name: Delete workflow runs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete skipped
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 0
+          keep_minimum_runs: 0
+          delete_run_by_conclusion_pattern: skipped
+
+      - name: Delete cancelled
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 0
+          keep_minimum_runs: 0
+          delete_run_by_conclusion_pattern: cancelled
+
+      - name: Delete workflow runs(older than a month)
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 30
+          keep_minimum_runs: 6

.github/workflows/development-docker.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - fb-*
 
 permissions:
   security-events: write
@@ -34,15 +35,18 @@ jobs:
 
           if [[ "${ENABLED,,}" != "true" ]]; then
             echo "enabled=0" >> $GITHUB_OUTPUT
-
             echo "Workflow is disabled"
 
             echo "### Workflow is disabled" >> $GITHUB_STEP_SUMMARY
             echo "To enable this workflow by creating a secret 'DEVELOPMENT_DOCKER' with the value 'true'" >> $GITHUB_STEP_SUMMARY
           else
-            echo "enabled=1" >> $GITHUB_OUTPUT
-
-            echo "Workflow is enabled"
+            if [[ "${{ github.repository_owner }}" != "0xERR0R" && "${GITHUB_REF#refs/heads/}" == "main" ]]; then
+              echo "enabled=0" >> $GITHUB_OUTPUT
+              echo "Workflow is disabled for main branch on forks"
+            else 
+              echo "enabled=1" >> $GITHUB_OUTPUT
+              echo "Workflow is enabled"
+            fi
           fi
 
   docker:
@@ -55,7 +59,7 @@ jobs:
       branch: ${{ steps.get_vars.outputs.branch }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -111,9 +115,15 @@ jobs:
           echo "build_time=${BUILD_TIME}" >> $GITHUB_OUTPUT
           echo "BUILD_TIME: ${BUILD_TIME}"
 
-          TAGS="ghcr.io/${REPOSITORY}:${BRANCH} , ghcr.io/${REPOSITORY}:development"
+          TAGS="ghcr.io/${REPOSITORY}:${BRANCH}"
+          if [[ "${BRANCH}" == "main" ]]; then
+            TAGS="${TAGS} , ghcr.io/${REPOSITORY}:development"
+          fi
           if [[ "${{ github.repository_owner }}" == "0xERR0R" ]]; then
-            TAGS="${TAGS} , spx01/blocky:${BRANCH} , spx01/blocky:development"
+            TAGS="${TAGS} , spx01/blocky:${BRANCH}"
+            if [[ "${BRANCH}" == "main" ]]; then
+              TAGS="${TAGS} , spx01/blocky:development"
+            fi
           fi
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
           echo "TAGS: ${TAGS}"
@@ -138,7 +148,7 @@ jobs:
     if: needs.check.outputs.enabled == 1
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@master
@@ -160,7 +170,7 @@ jobs:
     needs: docker
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/docs.yml

@@ -2,32 +2,35 @@ name: docs
 on:
   push:
     branches:
-      - main
+      - '**'
     tags:
       - v*
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    if: github.repository_owner == '0xERR0R'
+    if: ${{ github.event.repository.has_pages && (github.repository_owner != '0xERR0R' || github.ref_type == 'tag' || github.ref_name == 'main') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x
-      
+
       - name: install tools
         run: pip install mkdocs-material mike
-            
+
       - name: Setup doc deploy
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
 
-      - name: Deploy version for tag/branch
-        run: mike deploy --push --update-aliases ${GITHUB_REF_NAME}
-      - name: Deploy latest version for tag only
-        if: ${{ github.ref != 'refs/heads/main' }}
-        run: mike deploy --push --update-aliases ${GITHUB_REF_NAME} latest
-      - run: mike set-default --push latest
+      - name: Deploy version
+        run: |
+          VERSION="$(sed 's:/:-:g' <<< "$GITHUB_REF_NAME")"
+          if [[ ${{github.ref}} =~ ^refs/tags/ ]]; then
+            EXTRA_ALIAS=latest
+          fi
+          mike deploy --push --update-aliases "$VERSION" $EXTRA_ALIAS
+          tr '[:upper:]' '[:lower:]' <<< "https://${{github.repository_owner}}.github.io/${{github.event.repository.name}}/$VERSION/" >> "$GITHUB_STEP_SUMMARY"

.github/workflows/fork-sync.yml

@@ -0,0 +1,36 @@
+name: Sync Fork
+
+on:
+  schedule:
+    - cron: '*/30 * * * *'
+  workflow_dispatch:
+
+concurrency: 
+  group: ${{ github.workflow }}
+
+jobs:
+  sync:
+    name: Sync with Upstream
+    runs-on: ubuntu-latest
+    if: github.repository_owner != '0xERR0R'
+    steps:
+      - name: Enabled Check
+        id: check
+        shell: bash
+        run: | 
+          if [[ "${{ secrets.FORK_SYNC_TOKEN }}" != "" ]]; then
+            echo "enabled=1" >> $GITHUB_OUTPUT
+
+            echo "Workflow is enabled"
+          else
+            echo "enabled=0" >> $GITHUB_OUTPUT
+
+            echo "Workflow is disabled(create FORK_SYNC_TOKEN secret with repo write permission to enable it)"
+          fi
+      - name: Sync
+        if: ${{ steps.check.outputs.enabled == 1 }}
+        env:
+          GH_TOKEN: ${{ secrets.FORK_SYNC_TOKEN }}
+        shell: bash
+        run: | 
+          gh repo sync ${{ github.repository }} -b main