CI: Fixes from zizmor

> A static analysis tool for Github Actions https://github.com/woodruffw/zizmor Mostly means adding `persist-credentials: false` to checkouts and replacing `{{ env.VARNAME }}` with shell substitution.
YosysHQ · Dec 12, 2024 · e609a59 · e609a59
1 parent e32e199
commit e609a59
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,7 +16,9 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-       submodules: true
+        submodules: true
+        persist-credentials: false
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
@@ -25,7 +25,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-         submodules: true
+          submodules: true
+          persist-credentials: false
       - name: Build
         run: make vcxsrc YOSYS_VER=latest
       - uses: actions/upload-artifact@v4
@@ -59,7 +60,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-         submodules: true
+          submodules: true
+          persist-credentials: false
       - name: Build
         run: |
           WASI_SDK=wasi-sdk-19.0
@@ -95,6 +97,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+          persist-credentials: false
       - uses: cachix/install-nix-action@v26
         with:
           install_url: https://releases.nixos.org/nix/nix-2.18.1/install

diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
@@ -20,7 +20,7 @@ jobs:
           # only run on push *or* pull_request, not both
           concurrent_skipping: ${{ env.docs_export && 'never' || 'same_content_newer'}}
       - id: docs_var
-        run: echo "docs_export=${{ env.docs_export }}" >> $GITHUB_OUTPUT
+        run: echo "docs_export=${docs_export}" >> $GITHUB_OUTPUT
 
   prepare-docs:
     # docs builds are needed for anything on main, any tagged versions, and any tag
@@ -47,12 +47,12 @@ jobs:
           echo "ENABLE_VERIFIC_LIBERTY := 1" >> Makefile.conf
           echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 1" >> Makefile.conf
           echo "ENABLE_CCACHE := 1" >> Makefile.conf
-          make -j${{ env.procs }} ENABLE_LTO=1
+          make -j$procs ENABLE_LTO=1
 
       - name: Prepare docs
         shell: bash
         run:
-          make docs/prep -j${{ env.procs }} TARGETS= EXTRA_TARGETS=
+          make docs/prep -j$procs TARGETS= EXTRA_TARGETS=
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -72,7 +72,7 @@ jobs:
       - name: Test build docs
         shell: bash
         run: |
-          make -C docs html -j${{ env.procs }} TARGETS= EXTRA_TARGETS=
+          make -C docs html -j$procs TARGETS= EXTRA_TARGETS=
 
       - name: Trigger RTDs build
         if: ${{ needs.check_docs_rebuild.outputs.docs_export == 'true' }}

diff --git a/.github/workflows/source-vendor.yml b/.github/workflows/source-vendor.yml
@@ -10,6 +10,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
+          persist-credentials: false
 
       - name: Create clean tarball
         run: |

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -46,6 +46,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
+          persist-credentials: false
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
@@ -89,6 +90,8 @@ jobs:
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
@@ -115,7 +118,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .local/
-          key: ${{ matrix.os }}-${{ env.IVERILOG_GIT }}
+          key: ${{ matrix.os }}-${IVERILOG_GIT}
 
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
@@ -167,6 +170,8 @@ jobs:
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
@@ -188,7 +193,7 @@ jobs:
       - name: Run tests
         shell: bash
         run: |
-          make -C docs test -j${{ env.procs }}
+          make -C docs test -j$procs
 
   test-docs-build:
     name: Try build docs
@@ -204,6 +209,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
+          persist-credentials: false
 
       - name: Runtime environment
         run: |
@@ -213,7 +219,7 @@ jobs:
         run: |
           make config-clang
           echo "ENABLE_CCACHE := 1" >> Makefile.conf
-          make -j${{ env.procs }}
+          make -j$procs
 
       - name: Install doc prereqs
         shell: bash
@@ -223,7 +229,7 @@ jobs:
       - name: Build docs
         shell: bash
         run: |
-          make docs DOC_TARGET=${{ matrix.docs-target }} -j${{ env.procs }}
+          make docs DOC_TARGET=${{ matrix.docs-target }} -j$procs
 
       - name: Store docs build artifact
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
@@ -48,6 +48,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
+          persist-credentials: false
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env

diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
@@ -40,7 +40,7 @@ jobs:
           echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 1" >> Makefile.conf
           echo "ENABLE_CCACHE := 1" >> Makefile.conf
           echo "ENABLE_FUNCTIONAL_TESTS := 1" >> Makefile.conf
-          make -j${{ env.procs }} ENABLE_LTO=1
+          make -j$procs ENABLE_LTO=1
 
       - name: Install Yosys
         run: |
@@ -51,14 +51,15 @@ jobs:
         with:
           repository: 'YosysHQ/sby'
           path: 'sby'
+          persist-credentials: false
 
       - name: Build SBY
         run: |
           make -C sby install DESTDIR=${GITHUB_WORKSPACE}/.local PREFIX=
 
       - name: Run Yosys tests
         run: |
-          make -j${{ env.procs }} test
+          make -j$procs test
 
       - name: Run Verific specific Yosys tests
         run: |

diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
       - name: Update flake.lock

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -14,6 +14,7 @@ jobs:
         with:
           fetch-depth: 0
           submodules: true
+          persist-credentials: false
       - name: Take last commit
         id: log
         run: echo "message=$(git log --no-merges -1 --oneline)" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -53,6 +53,7 @@ jobs:
         with:
           fetch-depth: 0
           submodules: true
+          persist-credentials: false
       - if: ${{ matrix.os.family == 'linux' }}
         name: "[Linux] Set up QEMU"
         uses: docker/setup-qemu-action@v3