Skip to content

Commit 2c73349

Browse files
authored
Merge pull request #45 from TrueNine/dev
🚀 [release] 0.0.34
2 parents 66bc2bd + 16d9a62 commit 2c73349

4 files changed

Lines changed: 24 additions & 74 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
with:
3434
fetch-depth: 1 # 浅克隆提升速度
3535

36-
- name: Set up JDK 24
36+
- name: Set up JDK 17
3737
uses: actions/setup-java@v5.0.0
3838
with:
39-
java-version: '24'
39+
java-version: '17'
4040
distribution: 'graalvm'
4141
cache: gradle
4242

@@ -158,10 +158,10 @@ jobs:
158158
with:
159159
fetch-depth: 1 # 浅克隆
160160

161-
- name: Set up JDK 24
161+
- name: Set up JDK 17
162162
uses: actions/setup-java@v5.0.0
163163
with:
164-
java-version: '24'
164+
java-version: '17'
165165
distribution: 'graalvm'
166166
cache: gradle
167167

@@ -215,28 +215,7 @@ jobs:
215215
${{ runner.os }}-docker-${{ matrix.group }}-
216216
${{ runner.os }}-docker-
217217
218-
# 🚀 并行预拉取数据库镜像 - 使用更轻量的镜像
219-
- name: Pre-pull database images
220-
if: matrix.containers == 'database'
221-
run: |
222-
echo "🐘 拉取数据库镜像..."
223-
docker pull postgres:16-alpine &
224-
docker pull mysql:8.0 &
225-
docker pull redis:7-alpine &
226-
wait
227-
echo "✅ 数据库镜像拉取完成"
228-
continue-on-error: true
229-
230-
# 🗄️ 预拉取缓存相关镜像
231-
- name: Pre-pull cache images
232-
if: matrix.containers == 'cache'
233-
run: |
234-
echo "📦 拉取缓存镜像..."
235-
docker pull redis:7-alpine &
236-
docker pull minio/minio:RELEASE.2024-01-16T16-07-38Z &
237-
wait
238-
echo "✅ 缓存镜像拉取完成"
239-
continue-on-error: true
218+
240219
241220
- name: Grant execute permission
242221
run: chmod +x gradlew

.github/workflows/maven-central-publish.yaml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
with:
5252
fetch-depth: 0
5353

54-
- name: Set up JDK 24
54+
- name: Set up JDK 17
5555
uses: actions/setup-java@v5.0.0
5656
with:
57-
java-version: '24'
57+
java-version: '17'
5858
distribution: 'graalvm'
5959
cache: gradle
6060

@@ -226,10 +226,10 @@ jobs:
226226
with:
227227
fetch-depth: 0
228228

229-
- name: Set up JDK 24
229+
- name: Set up JDK 17
230230
uses: actions/setup-java@v5.0.0
231231
with:
232-
java-version: '24'
232+
java-version: '17'
233233
distribution: 'graalvm'
234234
cache: gradle
235235

@@ -472,48 +472,22 @@ jobs:
472472
timeout-minutes: 15
473473

474474
steps:
475-
- name: Wait for Maven Central sync
475+
- name: Skip verification (save time)
476476
run: |
477-
echo "⏳ 等待 Maven Central 同步..."
478-
sleep 300 # 等待 5 分钟
479-
480-
- name: Verify publication
481-
run: |
482-
version="${{ needs.pre-publish-validation.outputs.version }}"
483-
group="io.github.truenine"
484-
485-
echo "🔍 验证发布的 artifacts..."
486-
487-
# 检查主要模块是否可用
488-
modules=("shared" "gradle-plugin" "bom")
489-
490-
for module in "${modules[@]}"; do
491-
artifact="${group}:composeserver-${module}:${version}"
492-
echo "检查 $artifact ..."
493-
494-
# 尝试从 Maven Central 获取 metadata
495-
url="https://search.maven.org/solrsearch/select?q=g:${group}+AND+a:composeserver-${module}+AND+v:${version}&rows=1&wt=json"
496-
497-
response=$(curl -s "$url" || echo '{"response":{"numFound":0}}')
498-
found=$(echo "$response" | jq -r '.response.numFound')
499-
500-
if [[ "$found" -gt 0 ]]; then
501-
echo "✅ $artifact 已成功发布"
502-
else
503-
echo "⚠️ $artifact 尚未在 Maven Central 上可见(可能仍在同步中)"
504-
fi
505-
done
477+
echo "⏭️ 跳过 Maven Central 同步验证以节省时间"
478+
echo "📝 发布已完成,Maven Central 同步通常需要几小时"
506479
507480
- name: Generate verification report
508481
run: |
509482
echo "## 🔍 发布验证报告" >> $GITHUB_STEP_SUMMARY
510483
echo "" >> $GITHUB_STEP_SUMMARY
511484
echo "**版本:** ${{ needs.pre-publish-validation.outputs.version }}" >> $GITHUB_STEP_SUMMARY
512485
echo "" >> $GITHUB_STEP_SUMMARY
513-
echo "### 📊 验证状态" >> $GITHUB_STEP_SUMMARY
486+
echo "### 📊 发布状态" >> $GITHUB_STEP_SUMMARY
514487
echo "" >> $GITHUB_STEP_SUMMARY
488+
echo "- ✅ 发布任务已完成" >> $GITHUB_STEP_SUMMARY
515489
echo "- ⏳ Maven Central 同步可能需要几小时" >> $GITHUB_STEP_SUMMARY
516-
echo "- 🔍 建议在 4-6 小时后再次验证" >> $GITHUB_STEP_SUMMARY
490+
echo "- 🔍 建议在 4-6 小时后手动验证可用性" >> $GITHUB_STEP_SUMMARY
517491
echo "" >> $GITHUB_STEP_SUMMARY
518492
echo "### 🔗 相关链接" >> $GITHUB_STEP_SUMMARY
519493
echo "" >> $GITHUB_STEP_SUMMARY

integrate-test/cacheable/src/test/kotlin/itest/integrate/cacheable/TestEntrance.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package itest.integrate.cacheable
22

33
import org.springframework.boot.autoconfigure.SpringBootApplication
44

5-
@SpringBootApplication
6-
internal class TestEntrance
5+
@SpringBootApplication internal class TestEntrance

integrate-test/cacheable/src/test/kotlin/itest/integrate/cacheable/factory/RedisConnectionFactoryIntegrationTest.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,36 @@ package itest.integrate.cacheable.factory
22

33
import io.github.truenine.composeserver.testtoolkit.testcontainers.ICacheRedisContainer
44
import jakarta.annotation.Resource
5-
import org.springframework.boot.test.context.SpringBootTest
6-
import org.springframework.data.redis.connection.RedisConnectionFactory
7-
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory
85
import kotlin.test.Test
9-
import kotlin.test.assertIs
106
import kotlin.test.assertEquals
7+
import kotlin.test.assertIs
118
import kotlin.test.assertNotNull
9+
import org.springframework.boot.test.context.SpringBootTest
10+
import org.springframework.data.redis.connection.RedisConnectionFactory
11+
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory
1212

1313
@SpringBootTest
1414
class RedisConnectionFactoryIntegrationTest : ICacheRedisContainer {
1515

16-
@Resource
17-
lateinit var factory: RedisConnectionFactory
16+
@Resource lateinit var factory: RedisConnectionFactory
1817

1918
@Test
2019
fun `验证工厂使用最新的RESP3协议连接`() {
2120
val lettuceFactory = assertIs<LettuceConnectionFactory>(factory)
22-
21+
2322
// 验证连接成功
2423
val connection = lettuceFactory.connection
2524
try {
2625
val pingResult = connection.ping()
2726
assertEquals("PONG", pingResult)
28-
27+
2928
// 获取客户端选项并验证协议版本
3029
val clientOptions = lettuceFactory.clientConfiguration.clientOptions.orElse(null)
3130
assertNotNull(clientOptions, "客户端选项不应为空")
32-
31+
3332
// 验证协议版本为 RESP3
3433
val protocolVersion = clientOptions.protocolVersion
3534
assertEquals("RESP3", protocolVersion.toString(), "应该使用最新的 RESP3 协议")
36-
3735
} finally {
3836
connection.close()
3937
}

0 commit comments

Comments
 (0)