Skip to content

Commit 0b12510

Browse files
AMashenkovAMashenkov
committed
Merge branch 'main' into ignite-27981 
2 parents a370bf6 + d4b2489 commit 0b12510

1,631 files changed

Lines changed: 115166 additions & 31305 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/python_dbapi_wheels.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Build Python DB API Driver Wheels"
33
on:
44
push:
55
paths:
6-
- 'modules/platforms/python/**'
6+
- 'modules/platforms/python/dbapi/**'
77
- '.github/workflows/python_dbapi_wheels.yml'
88

99
workflow_dispatch:
@@ -27,16 +27,16 @@ jobs:
2727
run: python -m pip install --upgrade setuptools packaging>=24.2
2828

2929
- name: Copy C++ sources
30-
run: cp -r modules/platforms/cpp modules/platforms/python/
30+
run: cp -r modules/platforms/cpp modules/platforms/python/dbapi/
3131

3232
- name: Build source distribution
33-
working-directory: modules/platforms/python
33+
working-directory: modules/platforms/python/dbapi
3434
run: python setup.py sdist --formats=gztar --dist-dir ./dist
3535

3636
- uses: actions/upload-artifact@v4
3737
with:
3838
name: source-distributions
39-
path: modules/platforms/python/dist/*
39+
path: modules/platforms/python/dbapi/dist/*
4040

4141
build_wheels:
4242
name: Build wheels on ${{ matrix.os }}
@@ -80,7 +80,7 @@ jobs:
8080
vcpkg install openssl:x64-windows-static-md
8181
8282
- name: Build wheels ${{ matrix.os }}
83-
run: python -m cibuildwheel --output-dir modules/platforms/python/wheels modules/platforms/python
83+
run: python -m cibuildwheel --output-dir modules/platforms/python/dbapi/wheels modules/platforms/python/dbapi
8484
env:
8585
CIBW_BUILD: ${{ matrix.cibw_build || 'cp31{0,1,2,3,4}-*' }}
8686
CIBW_ARCHS: ${{ matrix.arch }}
@@ -91,7 +91,7 @@ jobs:
9191
- uses: actions/upload-artifact@v4
9292
with:
9393
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
94-
path: modules/platforms/python/wheels/*.whl
94+
path: modules/platforms/python/dbapi/wheels/*.whl
9595

9696
merge:
9797
runs-on: ubuntu-latest

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@ out/
2525
**/hs_err_pid*
2626

2727
# OpenAPI spec file
28-
modules/rest-api/openapi/openapi.*
28+
modules/rest-api/openapi/openapi.*
29+
30+
# Ignore any locally generated static or html docs
31+
html/
32+
static/

‎.idea/checkstyle-idea.xml‎

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.teamcity/_Self/Project.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ object Project : Project({
2525
hiddenText("env.GRADLE_OPTS", "-Dorg.gradle.caching=true")
2626
hiddenText("env.JAVA_HOME", "%env.JDK_ORA_17%")
2727
hiddenText("env.M2_HOME", "%teamcity.tool.maven.DEFAULT%")
28+
hiddenText("teamcity.internal.docker.busybox", "docker.gridgain.com/dockerhub-proxy/busybox:latest")
2829
}
2930
})

‎.teamcity/build/distributions/CppClientPackages.kt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package build.distributions
2+
3+
import jetbrains.buildServer.configs.kotlin.BuildType
4+
import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
5+
import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customGradle
6+
import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customScript
7+
8+
object CppClientPackages : BuildType({
9+
name = "[11] ODBC and C++ Client packages"
10+
description = "Apache Ignite 3 ODBC and C++ Client Packages"
11+
12+
artifactRules = """
13+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*odbc*.deb => odbc-deb
14+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*odbc*.deb.sha256 => odbc-deb
15+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*client*.deb => client-deb
16+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*client*.deb.sha256 => client-deb
17+
18+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*odbc*.rpm => odbc-rpm
19+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*odbc*.rpm.sha256 => odbc-rpm
20+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*client*.rpm => client-rpm
21+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*client*.rpm.sha256 => client-rpm
22+
23+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*odbc*.tar.gz => odbc-tgz
24+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*odbc*.tar.gz.sha256 => odbc-tgz
25+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*client*.tar.gz => client-tgz
26+
%VCSROOT__IGNITE3%/modules/platforms/build/cpp/_packages/*client*.tar.gz.sha256 => client-tgz
27+
""".trimIndent()
28+
29+
params {
30+
param("CONTAINER_JAVA_HOME", "/usr/lib/jvm/java-17-openjdk/")
31+
}
32+
33+
steps {
34+
customScript(type = "bash") {
35+
name = "Setup Docker Proxy"
36+
}
37+
38+
customGradle {
39+
name = "Build ODBC and Client packages. RPM, DEB, TGZ. (Under Rocky Linux 8 container)"
40+
tasks = ":platforms:cmakeCpack"
41+
workingDir = "%VCSROOT__IGNITE3%"
42+
gradleParams = "-i -Pplatforms.enable"
43+
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
44+
dockerPull = true
45+
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
46+
dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME%"
47+
}
48+
}
49+
})

‎.teamcity/build/distributions/OdbcDeb.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object OdbcDeb : BuildType({
3939
tasks = ":packaging-odbc:buildDeb"
4040
workingDir = "%VCSROOT__IGNITE3%"
4141
gradleParams = "-i -Pplatforms.enable"
42-
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.0"
42+
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
4343
dockerPull = true
4444
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
4545
dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME%"

‎.teamcity/build/distributions/OdbcRpm.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object OdbcRpm : BuildType({
3838
tasks = ":packaging-odbc:buildRpm"
3939
workingDir = "%VCSROOT__IGNITE3%"
4040
gradleParams = "-i -Pplatforms.enable"
41-
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.0"
41+
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
4242
dockerPull = true
4343
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
4444
dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME%"

‎.teamcity/build/distributions/OdbcZip.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ object OdbcZip : BuildType({
4040
tasks = ":packaging-odbc:distZip"
4141
workingDir = "%VCSROOT__IGNITE3%"
4242
gradleParams = "-i -Pplatforms.enable"
43-
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.0"
43+
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
4444
dockerPull = true
4545
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
4646
dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME%"
@@ -50,7 +50,7 @@ object OdbcZip : BuildType({
5050
tasks = ":packaging-odbc:distTar"
5151
workingDir = "%VCSROOT__IGNITE3%"
5252
gradleParams = "-i -Pplatforms.enable"
53-
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.0"
53+
dockerImage = "docker.gridgain.com/ci/tc-rockylinux8-odbc:v1.1"
5454
dockerPull = true
5555
dockerImagePlatform = GradleBuildStep.ImagePlatform.Linux
5656
dockerRunParameters = "-e JAVA_HOME=%CONTAINER_JAVA_HOME%"

‎.teamcity/build/distributions/Project.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ object Project : Project({
1515
listOf(
1616
CliDeb,
1717
CliRpm,
18+
CppClientPackages,
1819
Deb,
1920
Docs,
2021
Docker,

‎.teamcity/files/docker/rockylinux8-odbc-cpp.dockerfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM rockylinux:8
2+
# Install dependencies
3+
RUN dnf update -y
4+
RUN dnf -y install epel-release
5+
RUN dnf update -y
6+
RUN dnf install -y --setopt=max_parallel_downloads=10 --setopt=fastestmirror=True git gcc gcc-c++ clang make cmake unixODBC-devel openssl-devel java-11-openjdk-devel java-17-openjdk-devel rpm-build dpkg
7+
RUN dnf clean all
8+
RUN rm -rf /var/cache/dnf

0 commit comments

Comments
 (0)