From 82ff2c79530e46b2ed5afd353ea1e7c76124eb77 Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Fri, 21 Oct 2022 11:53:15 +0800
Subject: [PATCH 1/3] improve nil receiver handling for package gtime

---
 os/gtime/gtime_time.go | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/os/gtime/gtime_time.go b/os/gtime/gtime_time.go
index 0061070c4b0..1ed85100de1 100644
--- a/os/gtime/gtime_time.go
+++ b/os/gtime/gtime_time.go
@@ -317,7 +317,16 @@ func (t *Time) Truncate(d time.Duration) *Time {
 // See the documentation on the Time type for the pitfalls of using == with
 // Time values; most code should use Equal instead.
 func (t *Time) Equal(u *Time) bool {
-	return t.Time.Equal(u.Time)
+	switch {
+	case t == nil && u != nil:
+		return false
+	case t == nil && u == nil:
+		return true
+	case t != nil && u == nil:
+		return false
+	default:
+		return t.Time.Equal(u.Time)
+	}
 }
 
 // Before reports whether the time instant t is before u.
@@ -327,7 +336,14 @@ func (t *Time) Before(u *Time) bool {
 
 // After reports whether the time instant t is after u.
 func (t *Time) After(u *Time) bool {
-	return t.Time.After(u.Time)
+	switch {
+	case t == nil:
+		return false
+	case t != nil && u == nil:
+		return true
+	default:
+		return t.Time.After(u.Time)
+	}
 }
 
 // Sub returns the duration t-u. If the result exceeds the maximum (or minimum)
@@ -335,6 +351,9 @@ func (t *Time) After(u *Time) bool {
 // will be returned.
 // To compute t-d for a duration d, use t.Add(-d).
 func (t *Time) Sub(u *Time) time.Duration {
+	if t == nil || u == nil {
+		return 0
+	}
 	return t.Time.Sub(u.Time)
 }
 

From 0342aad4b736eee527ea2f785cc5895e6723b0ef Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Tue, 25 Oct 2022 20:30:16 +0800
Subject: [PATCH 2/3] CI updates

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

diff --git a/.github/workflows/gf.yml b/.github/workflows/gf.yml
index 271306a8337..bc7836f2a7f 100644
--- a/.github/workflows/gf.yml
+++ b/.github/workflows/gf.yml
@@ -141,6 +141,12 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
+    - name: Start Apollo Containers
+      run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
+
+    - name: Start Redis Cluster Containers
+      run:  docker-compose -f ".github/workflows/redis/docker-comwpose.yml" up -d --build
+
     - name: Start Minikube
       uses: medyagh/setup-minikube@master
 
@@ -161,22 +167,16 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-go-${{ matrix.go-version }}-
 
-    - name: Start redis cluster containers
-      run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" up -d --build
-
-    - name: Start apollo containers
-      run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
-
     - name: Before Script
       run:  bash .github/workflows/before_script.sh
 
     - name: Build & Test
       run:  bash .github/workflows/build_and_test.sh
 
-    - name: Stop redis cluster containers
+    - name: Stop Redis Cluster Containers
       run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" down
 
-    - name: Stop apollo containers
+    - name: Stop Apollo Containers
       run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" down
 
     - name: Report Coverage

From 70c7ad28aa492b24b82a0fd2df37ee35563abfdd Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Tue, 25 Oct 2022 21:20:37 +0800
Subject: [PATCH 3/3] CI updates

---
 .github/workflows/gf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gf.yml b/.github/workflows/gf.yml
index bc7836f2a7f..0ae822d42c4 100644
--- a/.github/workflows/gf.yml
+++ b/.github/workflows/gf.yml
@@ -145,7 +145,7 @@ jobs:
       run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
 
     - name: Start Redis Cluster Containers
-      run:  docker-compose -f ".github/workflows/redis/docker-comwpose.yml" up -d --build
+      run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" up -d --build
 
     - name: Start Minikube
       uses: medyagh/setup-minikube@master