Skip to content

Commit 372c42d

Browse files
authored
Merge branch 'main' into issue_6570
2 parents 5037640 + cc103fc commit 372c42d

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.github/workflows/docker-image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ jobs:
106106
uses: docker/setup-qemu-action@v3
107107

108108
- name: Login to Docker Hub
109-
uses: docker/login-action@v2
109+
uses: docker/login-action@v3
110110
with:
111111
username: ${{ github.event.inputs.username }}
112112
password: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }}
113113

114114
- name: Set up Docker Buildx
115-
uses: docker/setup-buildx-action@v2
115+
uses: docker/setup-buildx-action@v3
116116

117117
- uses: actions/checkout@v4
118118

.github/workflows/python-integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
needs: changes
4949
if: needs.changes.outputs.source_changes == 'true'
5050
runs-on: ubuntu-latest
51-
timeout-minutes: 45
51+
timeout-minutes: 60
5252
strategy:
5353
matrix:
5454
# Integration test for AMD64 architecture

.github/workflows/trino-integration-test.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ jobs:
8787
run: |
8888
./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false :trino-connector:integration-test:test
8989
./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=${{ matrix.java-version }} -PskipDockerTests=false :trino-connector:integration-test:test
90-
trino-connector/integration-test/trino-test-tools/run_test.sh
90+
# Disable the Trino cascading query integration test, because the connector jars are private now.
91+
#trino-connector/integration-test/trino-test-tools/run_test.sh
9192
9293
- name: Upload integrate tests reports
9394
uses: actions/upload-artifact@v4

web/web/src/app/metalakes/metalake/rightContent/LinkVersionDialog.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ const schema = yup.object().shape({
6464
.array()
6565
.of(
6666
yup.object().shape({
67-
name: yup
68-
.string()
69-
.required('The alias is required')
70-
.test('not-number', 'Alias cannot be a number or a numeric string', value => {
71-
return value === undefined || isNaN(Number(value))
72-
})
67+
name: yup.string().test('not-number', 'Alias cannot be a number or a numeric string', value => {
68+
return (value && isNaN(Number(value))) || !value
69+
})
7370
})
7471
)
7572
.test('unique', 'Alias must be unique', (aliases, ctx) => {
@@ -214,7 +211,7 @@ const LinkVersionDialog = props => {
214211

215212
const schemaData = {
216213
uri: data.uri,
217-
aliases: data.aliases.map(alias => alias.name),
214+
aliases: data.aliases.map(alias => alias.name).filter(aliasName => aliasName),
218215
comment: data.comment,
219216
properties
220217
}

0 commit comments

Comments
 (0)