wip

Author: jorgenmk

.github/workflows/build.yml

@@ -132,7 +132,7 @@ jobs:
         uses: ./asset-tracker-template/.github/actions/build-step
         with:
           memfault_project_key: ${{ secrets.MEMFAULT_PROJECT_KEY }}
-          memfault_fw_type:  ${{ inputs.memfault_fw_type }}
+          memfault_fw_type: ${{ inputs.memfault_fw_type }}
           memfault_fw_version_prefix: ${{ env.MEMFAULT_FW_VERSION_PREFIX }}
           board: nrf9151dk/nrf9151/ns
           short_board: nrf9151dk
@@ -145,13 +145,13 @@ jobs:
         uses: ./asset-tracker-template/.github/actions/build-step
         with:
           memfault_project_key: ${{ secrets.MEMFAULT_PROJECT_KEY }}
-          memfault_fw_type:  ${{ inputs.memfault_fw_type }}
+          memfault_fw_type: ${{ inputs.memfault_fw_type }}
           memfault_fw_version_prefix: ${{ env.MEMFAULT_FW_VERSION_PREFIX }}
           board: nrf9151dk/nrf9151/ns
           short_board: nrf9151dk
           version: ${{ env.VERSION }}
           path: asset-tracker-template/app
-      
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -163,18 +163,33 @@ jobs:
           echo Run id: ${{ github.run_id }}
           echo Version: ${{ env.VERSION }}
 
-      - name: Auto PR update NCS reference
+      - name: Create update PR
         if: ${{ inputs.nrfsdk_sha_update }}
-        working-directory: asset-tracker-template
+        uses: peter-evans/create-pull-request@v7
+        id: pr
+        with:
+          path: asset-tracker-template
+          add-paths: west.yml
+          commit-message: "manifest: auto: Update nrf-sdk SHA"
+          branch: nrf-manifest-auto-branch
+          base: main
+          title: "manifest: auto: Update nrf-sdk SHA"
+
+      - name: Check outputs
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add west.yml
-          git commit -m "manifest: auto: Update nrf-sdk SHA"
-          git push origin HEAD:nrf-manifest-auto-branch --force
-          gh pr create --title "manifest: auto: Update nrf-sdk SHA" \
-            --body "Created by GitHub Action" \
-            --base main \
-            --head nrf-manifest-auto-branch || true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          echo PR created: ${{ steps.pr.outputs.pull-request-nr }}
+      #- name: Create update PR
+      #  if: ${{ inputs.nrfsdk_sha_update }}
+      #  working-directory: asset-tracker-template
+      #  run: |
+      #    git config user.name "github-actions[bot]"
+      #    git config user.email "github-actions[bot]@users.noreply.github.com"
+      #    git add west.yml
+      #    git commit -m "manifest: auto: Update nrf-sdk SHA"
+      #    git push origin HEAD:nrf-manifest-auto-branch --force
+      #    gh pr create --title "manifest: auto: Update nrf-sdk SHA" \
+      #      --body "Created by GitHub Action" \
+      #      --base main \
+      #      --head nrf-manifest-auto-branch || true
+      #  env:
+      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ncsref-update.yaml

@@ -28,11 +28,14 @@ jobs:
     needs: [build, test]
     runs-on: ubuntu-latest
     permissions:
+      actions: read
+      contents: write
+      packages: read
       pull-requests: write
     steps:
       - name: Update PR state
         run: |
-          PR_ID=$(gh pr list --repo ${{ github.repo }} | grep nrf-manifest-auto-branch | awk '{print $1}')
-          gh pr review $PR_ID --approve --repo ${{ github.repo }}
+          PR_ID=$(gh pr list --repo ${{ github.repository }} | grep nrf-manifest-auto-branch | awk '{print $1}')
+          gh pr review $PR_ID --approve --repo ${{ github.repository }}
         env:
           GH_TOKEN: ${{ github.token }}