Merge branch 'main' into update-astro-for-yarn

This commit is contained in:
James M. Greene
2024-03-27 22:39:47 -05:00
committed by GitHub
8 changed files with 38 additions and 36 deletions
+23 -20
View File
@@ -21,7 +21,7 @@ on:
jobs: jobs:
analyze: analyze:
name: Analyze name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see: # Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql # - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources # - https://gh.io/supported-runners-and-hardware-resources
@@ -40,12 +40,15 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
language: [ $detected-codeql-languages ] $codeql-languages-matrix
# CodeQL supports [ $supported-codeql-languages ] # CodeQL supports the following values keywords for 'language': $supported-codeql-languages
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both # Use `c-cpp` to analyze code written in C, C++ or both
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
@@ -55,6 +58,7 @@ jobs:
uses: github/codeql-action/init@v3 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file. # 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. # 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. # Prefix the list here with "+" to use these queries and those in the config file.
@@ -62,21 +66,20 @@ jobs:
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality # queries: security-extended,security-and-quality
# If the analyze step fails for one of the languages you are analyzing with
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # "We were unable to automatically build your code", modify the matrix above
# If this step fails, then you should remove it and run the build manually (see below) # to set the build mode to "manual" for that language. Then modify this step
- name: Autobuild # to build your code.
uses: github/codeql-action/autobuild@v3
# ️ Command-line programs to run using the OS shell. # ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- if: matrix.build-mode == 'manual'
# If the Autobuild fails above, remove it and uncomment the following three lines. run: |
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. echo 'If you are using a "manual" build mode for one or more of the' \
'languages you are analyzing, replace this with the commands to build' \
# - run: | 'your code, for example:'
# echo "Run, Build Application using script" echo ' make bootstrap'
# ./location_of_script_within_repo/buildscript.sh echo ' make release'
exit 1
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3 uses: github/codeql-action/analyze@v3
+1 -1
View File
@@ -13,7 +13,7 @@
# 4. Manually, on demand, via the "workflow_dispatch" event # 4. Manually, on demand, via the "workflow_dispatch" event
# #
# The workflow should work with no modifications, but you might like to use a # The workflow should work with no modifications, but you might like to use a
# later version of the Detekt CLI by modifing the $DETEKT_RELEASE_TAG # later version of the Detekt CLI by modifying the $DETEKT_RELEASE_TAG
# environment variable. # environment variable.
name: Scan with Detekt name: Scan with Detekt
+1 -1
View File
@@ -24,7 +24,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
#### Package Build Instructions #### Package Build Instructions
### Use this section to define the build steps used by your software package. ### Use this section to define the build steps used by your software package.
### Endor Labs builds your software for you where possible but the required build tools must be made availible. ### Endor Labs builds your software for you where possible but the required build tools must be made available.
# - name: Setup Java # - name: Setup Java
# uses: actions/setup-java@v3 # uses: actions/setup-java@v3
# with: # with:
+2 -2
View File
@@ -28,7 +28,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1 uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
@@ -52,4 +52,4 @@ jobs:
uses: github/codeql-action/upload-sarif@v1 uses: github/codeql-action/upload-sarif@v1
with: with:
sarif_file: rust-clippy-results.sarif sarif_file: rust-clippy-results.sarif
wait-for-processing: true wait-for-processing: true
+7 -6
View File
@@ -32,19 +32,19 @@ jobs:
steps: steps:
- name: "Checkout code" - name: "Checkout code"
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with: with:
persist-credentials: false persist-credentials: false
- name: "Run analysis" - name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2 uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with: with:
results_file: results.sarif results_file: results.sarif
results_format: sarif results_format: sarif
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if: # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
# - you want to enable the Branch-Protection check on a *public* repository, or # - you want to enable the Branch-Protection check on a *public* repository, or
# - you are installing Scorecard on a *private* repository # - you are installing Scorecard on a *private* repository
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat. # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
# repo_token: ${{ secrets.SCORECARD_TOKEN }} # repo_token: ${{ secrets.SCORECARD_TOKEN }}
# Public repositories: # Public repositories:
@@ -59,14 +59,15 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab. # format to the repository Actions tab.
- name: "Upload artifact" - name: "Upload artifact"
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
with: with:
name: SARIF file name: SARIF file
path: results.sarif path: results.sarif
retention-days: 5 retention-days: 5
# Upload the results to GitHub's code scanning dashboard. # Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning" - name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4 uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
with: with:
sarif_file: results.sarif sarif_file: results.sarif
+2 -2
View File
@@ -49,7 +49,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
# 1.1 Login to ACR # 1.1 Login to ACR
- name: Login to ACR with the AccessKey pair - name: Login to ACR with the AccessKey pair
@@ -59,7 +59,7 @@ jobs:
access-key-id: "${{ secrets.ACCESS_KEY_ID }}" access-key-id: "${{ secrets.ACCESS_KEY_ID }}"
access-key-secret: "${{ secrets.ACCESS_KEY_SECRET }}" access-key-secret: "${{ secrets.ACCESS_KEY_SECRET }}"
# 1.2 Buid and push image to ACR # 1.2 Build and push image to ACR
- name: Build and push image to ACR - name: Build and push image to ACR
run: | run: |
docker build --tag "$REGISTRY/$NAMESPACE/$IMAGE:$TAG" . docker build --tag "$REGISTRY/$NAMESPACE/$IMAGE:$TAG" .
+1 -1
View File
@@ -31,7 +31,7 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
HUGO_VERSION: 0.120.4 HUGO_VERSION: 0.124.1
steps: steps:
- name: Install Hugo CLI - name: Install Hugo CLI
run: | run: |
+1 -3
View File
@@ -73,10 +73,8 @@ jobs:
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}- ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
- name: Install dependencies - name: Install dependencies
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
- name: Build with Next.js - name: Build and Static HTML export with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next build run: ${{ steps.detect-package-manager.outputs.runner }} next build
- name: Static HTML export with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next export
- name: Upload artifact - name: Upload artifact
uses: actions/upload-pages-artifact@v3 uses: actions/upload-pages-artifact@v3
with: with: