Skip to content

Commit b704b95

Browse files
authored
Merge pull request #1918 from ClickHouse/fix_build_for_release
[CI] Adjusted release/nightly to use LTS or predefined CH_VERSION
2 parents 41cd12e + 2c585d1 commit b704b95

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/nightly.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
env:
1414
CHC_BRANCH: "main"
1515
CHC_VERSION: "0.7.1"
16+
CH_VERSION: "24.8"
1617

1718
jobs:
1819
nightly:
@@ -66,7 +67,7 @@ jobs:
6667
uses: samuelmeuli/action-maven-publish@v1
6768
with:
6869
maven_profiles: release
69-
maven_args: -q --batch-mode
70+
maven_args: -q --batch-mode -DclickhouseVersion=${{ env.CH_VERSION }}
7071
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
7172
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
7273
nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
@@ -76,7 +77,7 @@ jobs:
7677
with:
7778
directory: clickhouse-r2dbc
7879
maven_profiles: release
79-
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE
80+
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
8081
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
8182
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
8283
nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}

.github/workflows/release.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
required: true
99
default: "0.7.1-SNAPSHOT"
1010

11+
env:
12+
CH_VERSION: "24.8"
13+
1114
jobs:
1215
release:
1316
name: "Build and Publish Artifact"
@@ -54,7 +57,7 @@ jobs:
5457
uses: samuelmeuli/action-maven-publish@v1
5558
with:
5659
maven_profiles: release
57-
maven_args: -q --batch-mode
60+
maven_args: -q --batch-mode -DclickhouseVersion=${{ env.CH_VERSION }}
5861
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
5962
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
6063
nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
@@ -64,7 +67,7 @@ jobs:
6467
with:
6568
directory: clickhouse-r2dbc
6669
maven_profiles: release
67-
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE
70+
maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
6871
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
6972
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
7073
nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}

0 commit comments

Comments
 (0)