GitHub Actions Update (#951)

* change to actions/setup-go

* test codeql change

* intenten fix

* remove strategy

* comment cleanup

* removed test branch

* convert main branch to development tag

* set development tag on main branch

.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@v3
+
+      # 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/development-docker.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - fb-*
 
 permissions:
   security-events: write
@@ -111,9 +112,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}"

.github/workflows/makefile.yml

@@ -46,8 +46,8 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 
-      - name: Setup Golang with cache
-        uses: magnetikonline/action-golang-cache@v4
+      - name: Setup Golang
+        uses: actions/setup-go@v4
         if: matrix.go == true
         with:
           go-version-file: go.mod