From 399cd480d825524ff2421eb89c215eb0fa133634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irving=20Mondrag=C3=B3n?= Date: Mon, 13 Apr 2026 11:25:55 +0200 Subject: [PATCH 01/17] fix(ci): propagate closing keywords to merge PR body MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Irving Mondragón --- .github/workflows/pr-merge.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index 1b57dfd..2107a99 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -51,12 +51,24 @@ jobs: GH_TOKEN: ${{ steps.generate-token.outputs.token }} run: | PR_BRANCH=${{ github.event.pull_request.base.ref }} - + PR_NUMBER=${PR_BRANCH#main-pr} + + # Use GitHub's API to get issues referenced with closing keywords + CLOSING_ISSUES=$(gh pr view "$PR_NUMBER" --json closingIssuesReferences \ + --jq '.closingIssuesReferences[].number' || true) + + BODY="This PR was automatically created by GitHub Actions to merge changes from $PR_BRANCH into main." + if [ -n "$CLOSING_ISSUES" ]; then + while IFS= read -r issue; do + BODY="$BODY"$'\n'"Closes #$issue" + done <<< "$CLOSING_ISSUES" + fi + # Create the pull request PR_URL=$(gh pr create \ --head "$PR_BRANCH" \ --base main \ --title "Merge External PR: Merge $PR_BRANCH into main" \ - --body "This PR was automatically created by GitHub Actions to merge changes from $PR_BRANCH into main.") + --body "$BODY") gh pr merge "$PR_URL" --rebase --admin --delete-branch From 04f6b74dee63587916f5e5bb993e373f2c9dbbaf Mon Sep 17 00:00:00 2001 From: charma7 <104625181+charma7@users.noreply.github.com> Date: Mon, 27 Apr 2026 17:21:28 +0300 Subject: [PATCH 02/17] Update contributors.yaml PR: https://github.com/urunc-dev/urunc_test/pull/8 Reviewed-by: Charalampos Mainas Approved-by: Charalampos Mainas --- .github/contributors.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/contributors.yaml b/.github/contributors.yaml index fce1b46..bf23f77 100644 --- a/.github/contributors.yaml +++ b/.github/contributors.yaml @@ -83,3 +83,6 @@ users: jim-junior: name: Beingana Jim Junior email: jimjunior854@gmail.com + charma7: + name: Test user + email: user@mmail.com From 1396ba85bda130c06b8a4cb6a102c3a5ca7b11d7 Mon Sep 17 00:00:00 2001 From: charma7 <104625181+charma7@users.noreply.github.com> Date: Mon, 27 Apr 2026 17:21:58 +0300 Subject: [PATCH 03/17] Update README.md PR: https://github.com/urunc-dev/urunc_test/pull/8 Reviewed-by: Charalampos Mainas Approved-by: Charalampos Mainas --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6dc4ba2..28c1904 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ supported VM/Sandbox monitors and unikernels: | Unikraft | QEMU, Firecracker | x86 | Initrd, 9pfs | | MirageOS | QEMU, Solo5-hvt, Solo5-spt | x86,aarch64 | Block/Devmapper | | Mewz | QEMU | x86 | In-memory | -| Linux | QEMU, Firecracker | x86 | Initrd, Block/Devmapper, 9pfs, Virtiofs | +| Linux | QEMU, Firecracker, clh | x86 | Initrd, Block/Devmapper, 9pfs, Virtiofs | | Hermit | QEMU | x86 | Initrd | We plan to add support for more unikernel frameworks and other platforms too. From 8cb696331690972de5a667e56316ea7822220638 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 10:08:19 +0300 Subject: [PATCH 04/17] Update pr review action Signed-off-by: Charalampos Mainas --- .github/contributors.yaml | 3 --- .github/workflows/add-git-trailers.yml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/contributors.yaml b/.github/contributors.yaml index bf23f77..fce1b46 100644 --- a/.github/contributors.yaml +++ b/.github/contributors.yaml @@ -83,6 +83,3 @@ users: jim-junior: name: Beingana Jim Junior email: jimjunior854@gmail.com - charma7: - name: Test user - email: user@mmail.com diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 73d5f5f..c1d19ee 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -58,7 +58,7 @@ jobs: git config --global user.email "urunc-bot[bot]@users.noreply.github.com" - name: Append git trailers - uses: nubificus/git-trailers@18fd322f3fbfd505b4de728974a4ac1f32f758a7 # feat_auto_merge + uses: nubificus/git-trailers@0db3a5a7c2d42933ca079cbd5b9919680ce1d869 # fix_auto_merge with: user_info: .github/contributors.yaml From b84b04adbf009396721207cb2c0fccfc1294c176 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 10:35:02 +0300 Subject: [PATCH 05/17] Update pr review action Signed-off-by: Charalampos Mainas --- .github/workflows/add-git-trailers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index c1d19ee..03a486d 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -58,7 +58,7 @@ jobs: git config --global user.email "urunc-bot[bot]@users.noreply.github.com" - name: Append git trailers - uses: nubificus/git-trailers@0db3a5a7c2d42933ca079cbd5b9919680ce1d869 # fix_auto_merge + uses: nubificus/git-trailers@6836cdd2a11bebdf282bcdad4dd82558e8f058f4 # fix_auto_merge with: user_info: .github/contributors.yaml From 26ad487ac3c8e6656709c05f94599ace39f5d58c Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 11:38:35 +0300 Subject: [PATCH 06/17] cleanup git trailers addition Signed-off-by: Charalampos Mainas --- .github/workflows/add-git-trailers.yml | 46 ++++++++------------------ .github/workflows/pr-trailers.yml | 16 --------- 2 files changed, 13 insertions(+), 49 deletions(-) delete mode 100644 .github/workflows/pr-trailers.yml diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 03a486d..f882ebf 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -1,12 +1,12 @@ name: Add Git Trailers to PR commits on: - workflow_call: - secrets: - GIT_CLONE_PAT: - required: false - URUNC_BOT_PRIVATE_KEY: - required: true + pull_request_review: + types: [submitted] + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true permissions: contents: read @@ -14,26 +14,17 @@ permissions: jobs: git-trailers: name: Add Git Trailers - runs-on: ${{ matrix.runner }} - strategy: - matrix: - include: - - arch: amd64 - runner: ubuntu-22.04 - continue-on-error: true - permissions: - contents: write - pull-requests: write + if: >- + github.event.pull_request.base.ref == 'main' && + github.event.review.state == 'approved' && + github.event.pull_request.rebaseable != false + runs-on: ubuntu-22.04 steps: - name: Harden the runner (Audit all outbound calls) uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0 with: egress-policy: audit - - name: Exit if PR is not rebaseable - if: ${{ github.event.pull_request.rebaseable != null && github.event.pull_request.rebaseable == false }} - run: exit 1 - - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -41,7 +32,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Append git trailers - uses: nubificus/git-trailers@8e08c91bb4c1fd9cb1ccbd9cc8029c31acf8da66 # feat_use_rebase + uses: nubificus/git-trailers@6836cdd2a11bebdf282bcdad4dd82558e8f058f4 # fix_auto_merge with: user_info: .github/contributors.yaml @@ -52,20 +43,9 @@ jobs: app-id: ${{ vars.URUNC_BOT_APP_ID }} private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - - name: Set up Git - run: | - git config --global user.name "urunc-bot[bot]" - git config --global user.email "urunc-bot[bot]@users.noreply.github.com" - - - name: Append git trailers - uses: nubificus/git-trailers@6836cdd2a11bebdf282bcdad4dd82558e8f058f4 # fix_auto_merge - with: - user_info: .github/contributors.yaml - - name: Merge PR env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} + PR_URL: ${{ github.event.pull_request.html_url }} run: | - PR_URL=${{ github.event.pull_request.html_url }} - gh pr merge "$PR_URL" --rebase --admin diff --git a/.github/workflows/pr-trailers.yml b/.github/workflows/pr-trailers.yml deleted file mode 100644 index 82fbcde..0000000 --- a/.github/workflows/pr-trailers.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Add Git Trailers to PR commits - -on: - pull_request_review: - types: [submitted] - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - git-trailers: - name: Add Git Trailers to PR commits - if: ${{ github.event.pull_request.base.ref == 'main' && github.event.review.state == 'approved' }} - uses: ./.github/workflows/add-git-trailers.yml - secrets: inherit From b51e0baa8ed7534c99504bba21386e93baaa682d Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 11:55:45 +0300 Subject: [PATCH 07/17] cleanup git trailers addition for external PRs too Signed-off-by: Charalampos Mainas --- .github/workflows/pr-merge.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index 2107a99..f54e485 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -23,11 +23,6 @@ jobs: with: egress-policy: audit - - name: Set up Git - run: | - git config --global user.name "urunc-bot[bot]" - git config --global user.email "urunc-bot[bot]@users.noreply.github.com" - - name: Check out repo uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: @@ -42,15 +37,15 @@ jobs: private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - name: Append git trailers - uses: nubificus/git-trailers@18fd322f3fbfd505b4de728974a4ac1f32f758a7 # feat_auto_merge + uses: nubificus/git-trailers@6836cdd2a11bebdf282bcdad4dd82558e8f058f4 # fix_auto_merge with: user_info: .github/contributors.yaml - name: Create a Pull Request from PR_BRANCH to main and merge it env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} + PR_BRANCH: ${{ github.event.pull_request.base.ref }} run: | - PR_BRANCH=${{ github.event.pull_request.base.ref }} PR_NUMBER=${PR_BRANCH#main-pr} # Use GitHub's API to get issues referenced with closing keywords From 1ffd3155ef9714e89c919f02ce319b84878a8fc8 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 12:11:32 +0300 Subject: [PATCH 08/17] Update git trailers action reference Signed-off-by: Charalampos Mainas --- .github/workflows/add-git-trailers.yml | 2 +- .github/workflows/pr-merge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index f882ebf..5b94f8f 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -32,7 +32,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Append git trailers - uses: nubificus/git-trailers@6836cdd2a11bebdf282bcdad4dd82558e8f058f4 # fix_auto_merge + uses: nubificus/git-trailers@60348012ae4e977498a958619e94222102a712d9 # fix_auto_merge with: user_info: .github/contributors.yaml diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index f54e485..77b2f71 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -37,7 +37,7 @@ jobs: private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - name: Append git trailers - uses: nubificus/git-trailers@6836cdd2a11bebdf282bcdad4dd82558e8f058f4 # fix_auto_merge + uses: nubificus/git-trailers@60348012ae4e977498a958619e94222102a712d9 # fix_auto_merge with: user_info: .github/contributors.yaml From ffe64ad404f6b1126574658890964764f9f3bf00 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 12:35:39 +0300 Subject: [PATCH 09/17] Update git trailers action reference Signed-off-by: Charalampos Mainas --- .github/workflows/add-git-trailers.yml | 2 +- .github/workflows/pr-merge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 5b94f8f..5cd4fa2 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -32,7 +32,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Append git trailers - uses: nubificus/git-trailers@60348012ae4e977498a958619e94222102a712d9 # fix_auto_merge + uses: nubificus/git-trailers@e3cefe03237a8a33f12ee41a8194bfb03a4d179b # fix_auto_merge with: user_info: .github/contributors.yaml diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index 77b2f71..82bea91 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -37,7 +37,7 @@ jobs: private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - name: Append git trailers - uses: nubificus/git-trailers@60348012ae4e977498a958619e94222102a712d9 # fix_auto_merge + uses: nubificus/git-trailers@e3cefe03237a8a33f12ee41a8194bfb03a4d179b # fix_auto_merge with: user_info: .github/contributors.yaml From e6526f63fd015ca9720435c6609af2f2cf48e624 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Wed, 29 Apr 2026 13:06:30 +0300 Subject: [PATCH 10/17] check target branch before executing Signed-off-by: Charalampos Mainas --- .github/workflows/pr-merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index 82bea91..7436ba2 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -4,6 +4,8 @@ on: pull_request_target: types: - closed + branches: + - 'main-pr*' permissions: contents: read From 64496e1c345e7b8118f11a5d79833059ad7e6924 Mon Sep 17 00:00:00 2001 From: charma7 <104625181+charma7@users.noreply.github.com> Date: Wed, 29 Apr 2026 13:01:32 +0300 Subject: [PATCH 11/17] Update contributors.yaml Add test user PR: https://github.com/urunc-dev/urunc_test/pull/24 Reviewed-by: Charalampos Mainas Approved-by: Charalampos Mainas --- .github/contributors.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/contributors.yaml b/.github/contributors.yaml index fce1b46..d5a7311 100644 --- a/.github/contributors.yaml +++ b/.github/contributors.yaml @@ -83,3 +83,6 @@ users: jim-junior: name: Beingana Jim Junior email: jimjunior854@gmail.com + charma7: + name: A test user + email: test@mail.com From 03c4737702585a60e7c290e691a20d1df0e6479a Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Mon, 4 May 2026 17:51:23 +0300 Subject: [PATCH 12/17] Use main and fix issues with trailers PR: https://github.com/urunc-dev/urunc_test/pull/26 Signed-off-by: Charalampos Mainas Reviewed-by: Anastassios Nanos Approved-by: Anastassios Nanos --- .github/workflows/add-git-trailers.yml | 20 +++++++++++--------- .github/workflows/pr-merge.yml | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 5cd4fa2..4fa2ba4 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -17,7 +17,8 @@ jobs: if: >- github.event.pull_request.base.ref == 'main' && github.event.review.state == 'approved' && - github.event.pull_request.rebaseable != false + (github.event.pull_request.rebaseable == null || + github.event.pull_request.rebaseable == true) runs-on: ubuntu-22.04 steps: - name: Harden the runner (Audit all outbound calls) @@ -25,24 +26,25 @@ jobs: with: egress-policy: audit + - name: Generate urunc-bot token + id: generate-token + uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 + with: + app-id: ${{ vars.URUNC_BOT_APP_ID }} + private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} + - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: + token: ${{ steps.generate-token.outputs.token }} fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} - name: Append git trailers - uses: nubificus/git-trailers@e3cefe03237a8a33f12ee41a8194bfb03a4d179b # fix_auto_merge + uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main with: user_info: .github/contributors.yaml - - name: Generate urunc-bot token - id: generate-token - uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0 - with: - app-id: ${{ vars.URUNC_BOT_APP_ID }} - private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - - name: Merge PR env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index 7436ba2..b4ecbbe 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -39,7 +39,7 @@ jobs: private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - name: Append git trailers - uses: nubificus/git-trailers@e3cefe03237a8a33f12ee41a8194bfb03a4d179b # fix_auto_merge + uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main with: user_info: .github/contributors.yaml From 476a28c4cbcce218ec14d903b77f3dbc71cf8f7b Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Mon, 4 May 2026 17:57:09 +0300 Subject: [PATCH 13/17] Fix input argument PR: https://github.com/urunc-dev/urunc_test/pull/26 Signed-off-by: Charalampos Mainas Reviewed-by: Anastassios Nanos Approved-by: Anastassios Nanos --- .github/workflows/add-git-trailers.yml | 2 +- .github/workflows/pr-merge.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 4fa2ba4..44d3fd5 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -43,7 +43,7 @@ jobs: - name: Append git trailers uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main with: - user_info: .github/contributors.yaml + user-info: .github/contributors.yaml - name: Merge PR env: diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index b4ecbbe..cec9491 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -41,7 +41,7 @@ jobs: - name: Append git trailers uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main with: - user_info: .github/contributors.yaml + user-info: .github/contributors.yaml - name: Create a Pull Request from PR_BRANCH to main and merge it env: From 1c553f41d83d84c8e8a9ff5d8cafd3b204d43bf3 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Mon, 4 May 2026 18:00:53 +0300 Subject: [PATCH 14/17] Add token as input PR: https://github.com/urunc-dev/urunc_test/pull/26 Signed-off-by: Charalampos Mainas Reviewed-by: Anastassios Nanos Approved-by: Anastassios Nanos --- .github/workflows/add-git-trailers.yml | 1 + .github/workflows/pr-merge.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 44d3fd5..77f76c5 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -43,6 +43,7 @@ jobs: - name: Append git trailers uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main with: + token: ${{ steps.generate-token.outputs.token }} user-info: .github/contributors.yaml - name: Merge PR diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index cec9491..451c25b 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -41,6 +41,7 @@ jobs: - name: Append git trailers uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main with: + token: ${{ steps.generate-token.outputs.token }} user-info: .github/contributors.yaml - name: Create a Pull Request from PR_BRANCH to main and merge it From e2e791a0c092a09841047b20559881d67d977140 Mon Sep 17 00:00:00 2001 From: Charalampos Mainas Date: Mon, 4 May 2026 18:59:05 +0300 Subject: [PATCH 15/17] Use specific branch of git trailers Signed-off-by: Charalampos Mainas --- .github/workflows/add-git-trailers.yml | 5 ++--- .github/workflows/pr-merge.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/add-git-trailers.yml b/.github/workflows/add-git-trailers.yml index 77f76c5..2f4c7f6 100644 --- a/.github/workflows/add-git-trailers.yml +++ b/.github/workflows/add-git-trailers.yml @@ -41,10 +41,9 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Append git trailers - uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main + uses: nubificus/git-trailers@e3cefe03237a8a33f12ee41a8194bfb03a4d179b # fix_auto_merge with: - token: ${{ steps.generate-token.outputs.token }} - user-info: .github/contributors.yaml + user_info: .github/contributors.yaml - name: Merge PR env: diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index 451c25b..7436ba2 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -39,10 +39,9 @@ jobs: private-key: ${{ secrets.URUNC_BOT_PRIVATE_KEY }} - name: Append git trailers - uses: nubificus/git-trailers@17259a95741e28bdfaddb3340656527d0708f53f # main + uses: nubificus/git-trailers@e3cefe03237a8a33f12ee41a8194bfb03a4d179b # fix_auto_merge with: - token: ${{ steps.generate-token.outputs.token }} - user-info: .github/contributors.yaml + user_info: .github/contributors.yaml - name: Create a Pull Request from PR_BRANCH to main and merge it env: From c999cd76b85001f14acb34dc17c23970377994f9 Mon Sep 17 00:00:00 2001 From: charma7 <104625181+charma7@users.noreply.github.com> Date: Tue, 5 May 2026 08:10:48 +0300 Subject: [PATCH 16/17] Update contributors.yaml PR: https://github.com/urunc-dev/urunc_test/pull/32 Reviewed-by: Charalampos Mainas Approved-by: Charalampos Mainas --- .github/contributors.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/contributors.yaml b/.github/contributors.yaml index d5a7311..0f5189b 100644 --- a/.github/contributors.yaml +++ b/.github/contributors.yaml @@ -84,5 +84,5 @@ users: name: Beingana Jim Junior email: jimjunior854@gmail.com charma7: - name: A test user + name: Another test user email: test@mail.com From 33b34676aa03942c4cc6cb4e91bf14b37c31ebbd Mon Sep 17 00:00:00 2001 From: imshubham22apr-gif Date: Wed, 6 May 2026 12:08:27 +0530 Subject: [PATCH 17/17] fix: resolve FD leak and correct TimeNamespace validation --- tests/e2e/test_functions.go | 4 ++-- tests/e2e/utils.go | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/e2e/test_functions.go b/tests/e2e/test_functions.go index 9e205c4..8045e62 100644 --- a/tests/e2e/test_functions.go +++ b/tests/e2e/test_functions.go @@ -310,9 +310,9 @@ func namespaceTest(tool testTool) error { return fmt.Errorf("cgroup: %w", err) } case specs.TimeNamespace: - err = compareNS(cntrNsMap["uts"], selfNsMap["uts"], ns.Path) + err = compareNS(cntrNsMap["time_for_children"], selfNsMap["time_for_children"], ns.Path) if err != nil { - return fmt.Errorf("uts: %w", err) + return fmt.Errorf("time: %w", err) } default: continue diff --git a/tests/e2e/utils.go b/tests/e2e/utils.go index b837255..6472323 100644 --- a/tests/e2e/utils.go +++ b/tests/e2e/utils.go @@ -191,6 +191,11 @@ func getProcNS(proc string) (map[string]string, error) { if err != nil { return nil, err } + timePath := filepath.Join(procPath, "time_for_children") + ns["time_for_children"], err = os.Readlink(timePath) + if err != nil { + return nil, err + } return ns, nil } @@ -245,6 +250,7 @@ func findLineInFile(filePath string, pattern string) (string, error) { if err != nil { return "", fmt.Errorf("Failed to open %s: %v", filePath, err) } + defer file.Close() scanner := bufio.NewScanner(file)