From 0ffb5307af346eb8b182d9e54926b06759f5438d Mon Sep 17 00:00:00 2001 From: NordicBuilder Date: Thu, 9 Jan 2025 13:41:34 +0100 Subject: [PATCH] next --- .github/workflows/compliance.yml | 2 +- .github/workflows/create-upmerge-PRs.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 99e8fd99bf..d8f40a2b39 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -4,7 +4,7 @@ on: pull_request jobs: compliance_job: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 name: Run compliance checks on patch series (PR) steps: - name: Update PATH for west diff --git a/.github/workflows/create-upmerge-PRs.yml b/.github/workflows/create-upmerge-PRs.yml index d97528539f..a75756e807 100644 --- a/.github/workflows/create-upmerge-PRs.yml +++ b/.github/workflows/create-upmerge-PRs.yml @@ -27,13 +27,14 @@ jobs: run: | pip3 install -r nrf/scripts/requirements-base.txt pip3 install -r nrf/scripts/requirements-extra.txt + pip3 inst -r nrf/scripts/requirements-extra.txt - name: Get repo urls working-directory: ncs run: | echo "SDK_ZEPHYR=$(west list zephyr -f {url} | awk -F// '{print $NF}')" >> $GITHUB_ENV echo "SDK_MCUBOOT=$(west list mcuboot -f {url} | awk -F// '{print $NF}')" >> $GITHUB_ENV - +#dummy comment - name: Try closing existing auto-upmerge PRs run: | SDK_ZEPHYR_PR=$(gh pr list --repo $SDK_ZEPHYR --label "auto-upmerge" --json number --jq .[0].number)