Update github action scripts

alibaba · Oct 21, 2024 · 5f69cc7 · 5f69cc7
1 parent 01cde1c
commit 5f69cc7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/ci.linux.arm.yml b/.github/workflows/ci.linux.arm.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: [self-hosted, Linux, ARM64]
 
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4
 
     steps:
@@ -44,7 +44,7 @@ jobs:
     runs-on: [self-hosted, Linux, ARM64]
 
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4
 
     steps:

diff --git a/.github/workflows/ci.linux.x86_64.yml b/.github/workflows/ci.linux.x86_64.yml
@@ -10,7 +10,7 @@ jobs:
   gcc850:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4 --privileged
     steps:
       - uses: szenius/[email protected]
@@ -44,7 +44,7 @@ jobs:
   gcc921:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4 --privileged
     steps:
       - uses: szenius/[email protected]
@@ -79,7 +79,7 @@ jobs:
   gcc1031:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4 --privileged
     steps:
       - uses: szenius/[email protected]
@@ -114,7 +114,7 @@ jobs:
   gcc1121:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4 --privileged
     steps:
       - uses: szenius/[email protected]
@@ -149,7 +149,7 @@ jobs:
   gcc1211:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/coldwings/photon-ut-base:latest
+      image: ghcr.io/alibaba/photon-ut-base:latest
       options: --cpus 4 --privileged
     steps:
       - uses: szenius/[email protected]
@@ -184,7 +184,7 @@ jobs:
   fstack:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/beef9999/photon-ut-fstack:latest
+      image: ghcr.io/alibaba/photon-ut-fstack:latest
       options: --cpus 4 --privileged
     steps:
       - uses: actions/checkout@v4
@@ -204,11 +204,14 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build
         run: |
+          export PHOTON_SRC_DIR=`pwd`
           dnf install -q -y git gcc-c++ cmake openssl-devel libcurl-devel libaio-devel zlib-devel epel-release
           dnf config-manager --set-enabled powertools
           dnf install -q -y gflags-devel snappy-devel zlib-devel bzip2-devel lz4-devel libzstd-devel
-          git clone -b photon-on-6.1.2 https://github.com/data-accelerator/rocksdb.git
-          cd rocksdb
+          git clone -b photon-on-6.1.2 https://github.com/data-accelerator/rocksdb.git /opt/rocksdb
+          cd /opt/rocksdb
+          rm -rf third-party/PhotonLibOS
+          ln -s $PHOTON_SRC_DIR third-party/PhotonLibOS
           ./photon-auto-convert.sh
           cmake -B build -D WITH_TESTS=on -D INIT_PHOTON_IN_ENV=on -D WITH_LZ4=on -D WITH_SNAPPY=on \
             -D CMAKE_BUILD_TYPE=Debug

diff --git a/.github/workflows/ut-image-base.yml b/.github/workflows/ut-image-base.yml
@@ -49,4 +49,4 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
             ${{ env.REGISTRY }}/${{ env.OWNER_LC }}/${{ env.IMAGE_NAME}}:latest
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64