Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: recent CI failure #572

Merged
merged 4 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 4 additions & 39 deletions .github/actions/setup/mysql/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: "mysql"
description: "setup mysql"
inputs:
version:
description: "mysql version"
required: false
default: "8.0.35"

runs:
using: "composite"
Expand All @@ -16,47 +11,17 @@ runs:
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld

- if: runner.os == 'macOS'
id: base
name: Initialize Setup Configuration
uses: ./.github/actions/setup/tool
- name: install redis with package manager
uses: ./.github/actions/setup/package
with:
tool: mysql
version: ${{ inputs.version }}

- if: runner.os == 'macOS'
name: Restore mysql Cache
id: restore
uses: actions/cache/restore@v3
with:
path: ${{ steps.base.outputs.cache-path }}
key: ${{ steps.base.outputs.cache-key }}

- if: runner.os == 'macOS'
name: Setup mysql into Runner Tool Cache
uses: pbrisbin/setup-tool-action@v2
with:
name: mysql
version: ${{ inputs.version }}
url: "https://downloads.mysql.com/archives/get/p/23/file/{name}-{version}-{os}-{arch}.{ext}"
os-darwin: macos13
arch: x86_64
subdir: "{name}-{version}-{os}-{arch}"
brew: [email protected]

- if: runner.os == 'macOS'
name: Add mysql bin to PATH
shell: bash
working-directory: ${{ steps.base.outputs.tool-path }}
run: echo "$PWD/bin" >> $GITHUB_PATH
run: echo "/opt/homebrew/opt/[email protected]/bin" >> $GITHUB_PATH

- name: Show mysql Version
shell: bash
working-directory: ${{ github.action_path }}
run: mysqld --version

- name: Save mysql Cache
if: runner.os == 'macOS' && steps.restore.outputs.cache-hit != 'true'
uses: actions/cache/save@v3
with:
path: ${{ steps.base.outputs.cache-path }}
key: ${{ steps.base.outputs.cache-key }}
8 changes: 4 additions & 4 deletions .github/workflows/standard-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,29 @@ jobs:
uses: ./.github/workflows/standalone-test.yml
with:
metadata-matrix: '["zookeeper"]'
os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]'
os-matrix: '["ubuntu-latest", "windows-latest"]'
db-matrix: '["VectorDB"]'
timeout-minutes: 300
standalone-test-no-optimizer-vectordb:
uses: ./.github/workflows/standalone-test-no-optimizer.yml
with:
metadata-matrix: '["zookeeper"]'
os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]'
os-matrix: '["ubuntu-latest", "windows-latest"]'
db-matrix: '["VectorDB"]'
timeout-minutes: 300
db-ce-vectordb:
uses: ./.github/workflows/DB-CE.yml
with:
metadata-matrix: '["zookeeper"]'
os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]'
os-matrix: '["ubuntu-latest", "windows-latest"]'
db-matrix: '["VectorDB"]'
functest: "NewSessionIT,SQLCompareIT,TagIT,RestIT,TransformIT,UDFIT,RestAnnotationIT,SQLSessionIT,SQLSessionPoolIT,SessionV2IT,CompactionIT,TimePrecisionIT,PySessionIT"
timeout-minutes: 360
db-ce-no-optimizer-vectordb:
uses: ./.github/workflows/DB-CE.yml
with:
metadata-matrix: '["zookeeper"]'
os-matrix: '["ubuntu-latest", "macos-latest", "windows-latest"]'
os-matrix: '["ubuntu-latest", "windows-latest"]'
db-matrix: '["VectorDB"]'
functest: "NewSessionIT,SQLCompareIT,TagIT,RestIT,TransformIT,UDFIT,RestAnnotationIT,SQLSessionIT,SQLSessionPoolIT,SessionV2IT,CompactionIT,TimePrecisionIT,PySessionIT"
timeout-minutes: 360
Expand Down
9 changes: 9 additions & 0 deletions dataSource/vectordb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,17 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.4.10</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down
Loading