Skip to content

Commit 038c8bb

Browse files
authored
Merge branch 'main' into feat_fix
2 parents c365b1c + 6b9013f commit 038c8bb

File tree

345 files changed

+10934
-5215
lines changed

Some content is hidden

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

345 files changed

+10934
-5215
lines changed

.github/actions/setup_docker/action.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ outputs:
2020
ecr_repo:
2121
description: "AWS public ECR Repository"
2222
value: ${{ steps.registry.outputs.ecr }}
23+
ghcr_repo:
24+
description: "GitHub Container Registry Repository"
25+
value: ${{ steps.registry.outputs.ghcr }}
2326

2427
runs:
2528
using: "composite"
@@ -57,9 +60,17 @@ runs:
5760
username: ${{ inputs.dockerhub_user }}
5861
password: ${{ inputs.dockerhub_token }}
5962

63+
- name: Login to GHCR
64+
uses: docker/login-action@v3
65+
with:
66+
registry: ghcr.io
67+
username: ${{ github.actor }}
68+
password: ${{ github.token }}
69+
6070
- name: Output Registries
6171
shell: bash
6272
id: registry
6373
run: |
6474
echo 'dockerhub=datafuselabs/${{ inputs.repo }}' >> $GITHUB_OUTPUT
6575
echo 'ecr=public.ecr.aws/i7g1w5q7/${{ inputs.repo }}' >> $GITHUB_OUTPUT
76+
echo 'ghcr=ghcr.io/${{ github.repository_owner }}/${{ inputs.repo }}' >> $GITHUB_OUTPUT

.github/actions/test_sqllogic_iceberg_tpch/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ runs:
3131
3232
pip install pyspark
3333
python3 tests/sqllogictests/scripts/prepare_iceberg_tpch_data.py
34+
python3 tests/sqllogictests/scripts/prepare_iceberg_test_data.py
3435
3536
3637
- name: Run sqllogic Tests with Standalone lib
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: "Test Stateful Standalone Iceberg Rest"
2+
description: "Running Stateful Iceberg Rest tests in standalone mode"
3+
runs:
4+
using: "composite"
5+
steps:
6+
- uses: ./.github/actions/setup_test
7+
8+
- name: Iceberg Rest Setup for (ubuntu-latest only)
9+
shell: bash
10+
run: |
11+
DOCKER_DEFAULT_PLATFORM=`docker info --format {{.OSType}}/{{.Architecture}}`
12+
docker-compose -f "./docker/it-iceberg-catalogs/docker-compose.yaml" up --quiet-pull -d
13+
hms_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq --filter "name=hive-metastore"))
14+
15+
docker ps -a | grep iceberg
16+
echo "HMS in $hms_ip"
17+
18+
- name: Run Stateful Tests with Standalone mode
19+
shell: bash
20+
run: |
21+
./scripts/ci/ci-run-stateful-iceberg-catalogs-tests-standalone.sh

.github/actions/test_stateful_iceberg_rest_standalone/action.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
## Release
44

5-
Databend make new releases via workflow [Release](./workflows/release.yml).
5+
Databend makes new releases via workflow [Release](./workflows/release.yml).
66

77
There are three ways to trigger a new release:
88

99
- Push a new tag
1010
- On Schedule (every day at 00:00 UTC+8)
1111
- Manually triggered
1212

13-
If new tags pushed, we use this the new tag name as release name. Otherwise, we will generate a new nightly tag.
13+
If new tags pushed, we use the new tag name as release name. Otherwise, we will generate a new nightly tag.
1414

1515
For example:
1616

@@ -23,4 +23,4 @@ For every release, we will:
2323
- Build binaries and pack them on Linux and MacOS.
2424
- Upload built packages to GitHub Releases, AWS S3 bucket and Docker Registry.
2525

26-
We are adopting github native release notes generation which controlled by [release.yml](./release.yml).
26+
We are adopting github native release notes generation which is controlled by [release.yml](./release.yml).

.github/workflows/cloud.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ permissions:
1111
id-token: write
1212
pull-requests: write
1313
contents: read
14+
packages: write
1415

1516
env:
1617
BUILD_PROFILE: release
@@ -97,17 +98,35 @@ jobs:
9798
with:
9899
repo: databend-query
99100
ecr_role_arn: ${{ secrets.ECR_ROLE_ARN }}
101+
dockerhub_user: ${{ secrets.DOCKERHUB_USERNAME }}
102+
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
100103
- name: Prepare for docker
101104
id: prepare
102105
run: |
103106
short_sha=$(echo "${{ needs.info.outputs.sha }}" | cut -c1-7)
104107
ts=$(date +%s)
105108
echo "tag=pr-${{ github.event.pull_request.number }}-${short_sha}-${ts}" >> $GITHUB_OUTPUT
109+
- name: Get Image Tags
110+
id: tags
111+
uses: actions/github-script@v7
112+
env:
113+
REPO_DOCKERHUB: ${{ steps.login.outputs.dockerhub_repo }}
114+
REPO_ECR: ${{ steps.login.outputs.ecr_repo }}
115+
VERSION: ${{ steps.prepare.outputs.tag }}
116+
with:
117+
script: |
118+
const { VERSION, REPO_DOCKERHUB, REPO_ECR } = process.env;
119+
const repos = [REPO_DOCKERHUB, REPO_ECR];
120+
let tags = [];
121+
for (const repo of repos) {
122+
tags.push(`${repo}:${VERSION}`);
123+
}
124+
core.setOutput('tags', tags.join(','));
106125
- name: push service image
107126
uses: docker/build-push-action@v5
108127
with:
109128
push: true
110-
tags: ${{ steps.login.outputs.ecr_repo }}:${{ steps.prepare.outputs.tag }}
129+
tags: ${{ steps.tags.outputs.tags }}
111130
platforms: linux/amd64,linux/arm64
112131
context: .
113132
file: ./docker/service/query.Dockerfile

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ permissions:
2929
checks: write
3030
statuses: write
3131
contents: write
32+
packages: write
3233

3334
env:
3435
BUILD_PROFILE: release

.github/workflows/reuse.linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,18 @@ jobs:
211211
- uses: ./.github/actions/test_stateful_large_data
212212
timeout-minutes: 60
213213

214-
test_stateful_iceberg_rest:
214+
test_stateful_iceberg_catalogs:
215215
runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"]
216216
needs: [build, check]
217217
steps:
218218
- uses: actions/checkout@v4
219-
- uses: ./.github/actions/test_stateful_iceberg_rest_standalone
219+
- uses: ./.github/actions/test_stateful_iceberg_catalogs_standalone
220220
timeout-minutes: 10
221221
- name: Upload failure
222222
if: failure()
223223
uses: ./.github/actions/artifact_failure
224224
with:
225-
name: test-stateful-iceberg-rest-standalone
225+
name: test-stateful-iceberg-catalogs-standalone
226226

227227
test_stateful_hive_standalone:
228228
needs: [build, check]
@@ -235,7 +235,7 @@ jobs:
235235
if: failure()
236236
uses: ./.github/actions/artifact_failure
237237
with:
238-
name: test-stateful-iceberg-rest-standalone
238+
name: test_stateful_hive_standalone
239239

240240
# test_fuzz_standalone:
241241
# runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"]

0 commit comments

Comments
 (0)