From ed50c7590cd1f31a6d0921fc5eecdf8367704fea Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 10 Jan 2026 11:35:01 +0000 Subject: [PATCH 1/4] ci: actions: Update checkout action version --- .github/workflows/static-analysis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index c313437..62fa5b0 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v6 with: fetch-depth: 1 From db0ee60823e2429999786245ebf412df0b207b6a Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 10 Jan 2026 11:49:53 +0000 Subject: [PATCH 2/4] ci: actions: Use env block for TARGET_WORKSPACE --- .github/workflows/build.yaml | 6 +++--- .github/workflows/static-analysis.yaml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index effb52b..b9c079d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -50,8 +50,8 @@ jobs: CC: ${{ matrix.compiler.CC }} AR: ${{ matrix.compiler.AR }} TARGET: ${{ github.event.repository.name }} + TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | - export TARGET_WORKSPACE="$(pwd)/projects" source projects/env.sh ns-clone -d -s -b ${GITHUB_REF_NAME} ns-make-libs install @@ -61,8 +61,8 @@ jobs: CC: ${{ matrix.compiler.CC }} AR: ${{ matrix.compiler.AR }} TARGET: ${{ github.event.repository.name }} + TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | - export TARGET_WORKSPACE="$(pwd)/projects" source projects/env.sh make -j"$(nproc)" @@ -71,8 +71,8 @@ jobs: CC: ${{ matrix.compiler.CC }} AR: ${{ matrix.compiler.AR }} TARGET: ${{ github.event.repository.name }} + TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | - export TARGET_WORKSPACE="$(pwd)/projects" source projects/env.sh make test diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 62fa5b0..cf4c77e 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -39,8 +39,8 @@ jobs: - name: Build and install project deps env: TARGET: ${{ github.event.repository.name }} + TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | - export TARGET_WORKSPACE="$(pwd)/projects" source projects/env.sh ns-clone -d -s ns-make-libs install @@ -51,8 +51,9 @@ jobs: languages: ${{ matrix.language }} - name: Build Library + env: + TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | - export TARGET_WORKSPACE="$(pwd)/projects" source projects/env.sh make -j"$(nproc)" From 3eb0d0402519c1334e3ed1b66387018ba9c42dd1 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 10 Jan 2026 11:50:36 +0000 Subject: [PATCH 3/4] ci: actions: Clone deps from GitHub --- .github/workflows/build.yaml | 2 ++ .github/workflows/static-analysis.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b9c079d..a5712f2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -50,6 +50,7 @@ jobs: CC: ${{ matrix.compiler.CC }} AR: ${{ matrix.compiler.AR }} TARGET: ${{ github.event.repository.name }} + REPO_BASE_URI: https://github.com/netsurf-browser TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | source projects/env.sh @@ -181,6 +182,7 @@ jobs: - name: Build and install project libs env: HOST: "${{ matrix.toolchain }}" + REPO_BASE_URI: https://github.com/netsurf-browser TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" TARGET: ${{ github.event.repository.name }} Q: diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index cf4c77e..5e81bd6 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -39,6 +39,7 @@ jobs: - name: Build and install project deps env: TARGET: ${{ github.event.repository.name }} + REPO_BASE_URI: https://github.com/netsurf-browser TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | source projects/env.sh From bc1e61bef1c5ef8c3ec4dc634b39b5d411f98b01 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 10 Jan 2026 11:51:00 +0000 Subject: [PATCH 4/4] ci: actions: static analysis: Look for matching branch for deps first --- .github/workflows/static-analysis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 5e81bd6..50c3b17 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -43,7 +43,7 @@ jobs: TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects" run: | source projects/env.sh - ns-clone -d -s + ns-clone -d -s -b ${GITHUB_REF_NAME} ns-make-libs install - name: Initialize CodeQL