Merge branch '7.1' of github.com:gchq/stroom into 7.2

gchq · Feb 7, 2025 · 07f4865 · 07f4865
2 parents 60a3dbe + 7c838a6
commit 07f4865
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
@@ -73,7 +73,7 @@ jobs:
         run: |
           "${ACTIONS_SCRIPTS_DIR}/echo_variables.sh" \
             "docker version" "$(docker --version)" \
-            "docker-compose version" "$(docker-compose --version)" \
+            "docker compose version" "$(docker compose version)" \
             "git version" "$(git --version)" \
             "GITHUB_WORKSPACE" "$GITHUB_WORKSPACE" \
             "GITHUB_REF" "$GITHUB_REF" \
@@ -96,6 +96,10 @@ jobs:
           # https://github.com/gchq/stroom/settings/secrets/actions
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          #PAT_FOR_PUBLIC_REPOS: ${{ secrets.PAT_FOR_PUBLIC_REPOS }}
+          # The special auto created token, used for authenticating
+          # downloads prevent rate limiting
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           pushd "${BUILD_DIR}" > /dev/null
           echo -e "${GREEN}Running ${BLUE}ci_build.sh${NC}"

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.