From 541a8e7b19807df00f1dcbae2ff765484b878679 Mon Sep 17 00:00:00 2001
From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com>
Date: Fri, 28 Aug 2026 11:24:21 +0200
Subject: [PATCH 1/5] test

---
 .github/workflows/ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 382fa2f8c5..2287169809 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -221,6 +221,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
       
+      - name: Unpack SWT Native fragment
+        shell: bash
+        run: |
+          unzip -o java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/org.eclipse.swt.win32.win32.x86_64_*.jar \
+           -d java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/
+          rm java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/org.eclipse.swt.win32.win32.x86_64_*.jar
+
+      
       - name: Upload artifact
         uses: actions/upload-artifact@v7
         with:

From 1f50d2bc71a376f6ea1cf2ae4fc5f2f82ff2191a Mon Sep 17 00:00:00 2001
From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com>
Date: Fri, 28 Aug 2026 12:01:59 +0200
Subject: [PATCH 2/5] Update ci.yml

---
 .github/workflows/ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2287169809..091c09e921 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -224,10 +224,11 @@ jobs:
       - name: Unpack SWT Native fragment
         shell: bash
         run: |
-          unzip -o java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/org.eclipse.swt.win32.win32.x86_64_*.jar \
-           -d java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/
-          rm java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/org.eclipse.swt.win32.win32.x86_64_*.jar
-
+          cd java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/plugins
+          for jar_file in org.eclipse.swt.win32.win32.x86_64_*.jar; do
+            jar -xf $jar_file -C ${jar_file%.jar}
+            rm $jar_file
+          done
       
       - name: Upload artifact
         uses: actions/upload-artifact@v7

From e0b92ac0799a83028841f3b929828b4ad906c2b2 Mon Sep 17 00:00:00 2001
From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com>
Date: Fri, 28 Aug 2026 12:27:46 +0200
Subject: [PATCH 3/5] Update ci.yml

---
 .github/workflows/ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 091c09e921..7ffc44733c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -224,11 +224,22 @@ jobs:
       - name: Unpack SWT Native fragment
         shell: bash
         run: |
+          # Unpack SWT Native fragment to avoid extract *.dll files from SWT jar file during runtime,
+          # which needs write permission to the temp folder and fails in some environments
           cd java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/plugins
           for jar_file in org.eclipse.swt.win32.win32.x86_64_*.jar; do
             jar -xf $jar_file -C ${jar_file%.jar}
             rm $jar_file
           done
+          
+          # Update bundles.info to point to the unpacked SWT Native fragment instead of the original SWT jar file
+          BUNDLES_INFO="java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info"
+          if [ -f "$BUNDLES_INFO" ]; then
+            sed -i -E \
+            's#(org\.eclipse\.swt\.win32\.win32\.x86_64,[0-9][^,]*,)plugins/(org\.eclipse\.swt\.win32\.win32\.x86_64_[^,]*)\.jar#\1plugins/\2#'  \
+            "$BUNDLES_INFO"
+          fi
+
       
       - name: Upload artifact
         uses: actions/upload-artifact@v7

From c973fce61d7cd2e05cc5b92532e90736c81081a9 Mon Sep 17 00:00:00 2001
From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com>
Date: Fri, 28 Aug 2026 12:36:54 +0200
Subject: [PATCH 4/5] Update ci.yml

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ffc44733c..37562a8840 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -228,6 +228,7 @@ jobs:
           # which needs write permission to the temp folder and fails in some environments
           cd java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/plugins
           for jar_file in org.eclipse.swt.win32.win32.x86_64_*.jar; do
+            echo "${jar_file}"
             jar -xf $jar_file -C ${jar_file%.jar}
             rm $jar_file
           done

From 93044a70f10954aad46562c49bea49042bdbac8e Mon Sep 17 00:00:00 2001
From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com>
Date: Fri, 28 Aug 2026 12:45:46 +0200
Subject: [PATCH 5/5] Update ci.yml

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37562a8840..aecde2a94f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -229,7 +229,11 @@ jobs:
           cd java/bundles/org.eclipse.set.releng.set.product/target/products/SET/win32/win32/x86_64/plugins
           for jar_file in org.eclipse.swt.win32.win32.x86_64_*.jar; do
             echo "${jar_file}"
-            jar -xf $jar_file -C ${jar_file%.jar}
+            mkdir -p ${jar_file%.jar}
+            (
+              cd ${jar_file%.jar}
+              jar -xf "../$(basename "$jar_file")"
+            )
             rm $jar_file
           done