From f6a8510a848fb0ed23acc8d5aa57c3148b042451 Mon Sep 17 00:00:00 2001
From: Curtis Wan <wcy9988@163.com>
Date: Thu, 29 Feb 2024 10:55:15 +0800
Subject: [PATCH] fix(ci): fix tag version regex; delete E2E results before
 running tests

Signed-off-by: Curtis Wan <wcy9988@163.com>
---
 .github/workflows/docker-release.yml | 2 +-
 .github/workflows/e2e-run.yml        | 7 ++++---
 .github/workflows/github-release.yml | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 331cdcad50..fa5b88fd33 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -4,7 +4,7 @@ on:
   push:
     tags:
       - '[0-9]+\.[0-9]+\.[0-9]+'
-      - '[0-9]+\.[0-9]+\.[0-9]+\-?[a-zA-Z]*'
+      - '[0-9]+\.[0-9]+\.[0-9]+\-[A-Za-z0-9]+'
 
 jobs:
   docker-release:
diff --git a/.github/workflows/e2e-run.yml b/.github/workflows/e2e-run.yml
index 6a44c524a3..58d13a37d9 100644
--- a/.github/workflows/e2e-run.yml
+++ b/.github/workflows/e2e-run.yml
@@ -27,11 +27,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.12.0
       - name: Clean last running results
         run: |
           rm -rf results
+          rm -rf "${{ inputs.storage-path }}/${{ inputs.suite-id }}"
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2.12.0
       - name: Run E2E tests with yaml
         if: ${{ inputs.test-path == '' }}
         run: ./tests/docker/run_tests.sh
@@ -47,7 +48,7 @@ jobs:
       - name: Move results
         run: |
           results_path="$(pwd)/results/$(readlink results/latest | cut -d'/' -f5)"
-          rm -rf "${{ inputs.storage-path }}/${{ inputs.suite-id }}";mv "${results_path}" "${{ inputs.storage-path }}/${{ inputs.suite-id }}"
+          mv "${results_path}" "${{ inputs.storage-path }}/${{ inputs.suite-id }}"
         if: ${{ always() }}
         shell: bash
       - name: Bring down docker containers
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 255da0b642..0aca51630c 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -4,7 +4,7 @@ on:
   push:
     tags:
       - '[0-9]+\.[0-9]+\.[0-9]+'
-      - '[0-9]+\.[0-9]+\.[0-9]+\-?[a-zA-Z]*'
+      - '[0-9]+\.[0-9]+\.[0-9]+\-[A-Za-z0-9]+'
 
 jobs:
   github-release:
@@ -41,6 +41,7 @@ jobs:
 
       - uses: jakejarvis/s3-sync-action@master
         name: s3-upload-latest
+        if: ${{ github.repository_owner == 'AutoMQ' }}
         with:
           args: --follow-symlinks --delete
         env: