From bb48c633399ea6fb4ec199f2ae0a68368b54438b Mon Sep 17 00:00:00 2001
From: "Zheng, Qi" <huaiqing.zq@antgroup.com>
Date: Fri, 28 Jun 2024 14:25:57 +0800
Subject: [PATCH] [ci] Update jammy debian package publish action

---
 .../workflows/package_repo_setup_and_test.yml | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/package_repo_setup_and_test.yml b/.github/workflows/package_repo_setup_and_test.yml
index b538b912..71b772a5 100644
--- a/.github/workflows/package_repo_setup_and_test.yml
+++ b/.github/workflows/package_repo_setup_and_test.yml
@@ -149,25 +149,25 @@ jobs:
         aptly -no-remove snapshot merge focal-main focal-old focal-new
         aptly publish snapshot -distribution=focal focal-main
 
-    # - name: Update apt repo for Ubuntu 22.04
-    #   run: |
-    #     export PATH=/usr/local/bin/aptly_1.5.0_linux_amd64:$PATH
-    #     aptly -architectures="amd64" -keyring=/etc/apt/trusted.gpg mirror create jammy-mirror https://occlum.io/occlum-package-repos/debian jammy main
-    #     aptly -keyring=/etc/apt/trusted.gpg mirror update jammy-mirror
-    #     aptly snapshot create jammy-old from mirror jammy-mirror
-    #     aptly -distribution='jammy' -architectures=amd64 repo create deb-jammy-new
-    #     aptly repo add deb-jammy-new $GITHUB_WORKSPACE/jammy-debs/*
-    #     aptly snapshot create jammy-new from repo deb-jammy-new
-    #     aptly -no-remove snapshot merge jammy-main jammy-old jammy-new
-    #     aptly publish snapshot -distribution=jammy jammy-main
-
-    - name: Update apt repo for Ubuntu 22.04 for first time
+    - name: Update apt repo for Ubuntu 22.04
       run: |
         export PATH=/usr/local/bin/aptly_1.5.0_linux_amd64:$PATH
+        aptly -architectures="amd64" -keyring=/etc/apt/trusted.gpg mirror create jammy-mirror https://occlum.io/occlum-package-repos/debian jammy main
+        aptly -keyring=/etc/apt/trusted.gpg mirror update jammy-mirror
+        aptly snapshot create jammy-old from mirror jammy-mirror
         aptly -distribution='jammy' -architectures=amd64 repo create deb-jammy-new
         aptly repo add deb-jammy-new $GITHUB_WORKSPACE/jammy-debs/*
         aptly snapshot create jammy-new from repo deb-jammy-new
-        aptly publish snapshot -distribution=jammy jammy-new
+        aptly -no-remove snapshot merge jammy-main jammy-old jammy-new
+        aptly publish snapshot -distribution=jammy jammy-main
+
+    # - name: Update apt repo for Ubuntu 22.04 for first time
+    #   run: |
+    #     export PATH=/usr/local/bin/aptly_1.5.0_linux_amd64:$PATH
+    #     aptly -distribution='jammy' -architectures=amd64 repo create deb-jammy-new
+    #     aptly repo add deb-jammy-new $GITHUB_WORKSPACE/jammy-debs/*
+    #     aptly snapshot create jammy-new from repo deb-jammy-new
+    #     aptly publish snapshot -distribution=jammy jammy-new
 
     - name: Update Git repo
       run: |