Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/apache/seatunnel into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
XenosK committed Nov 11, 2024
2 parents 5b2056f + 132278c commit 307a617
Show file tree
Hide file tree
Showing 684 changed files with 63,750 additions and 5,419 deletions.
79 changes: 72 additions & 7 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
dead-link:
name: Dead links
runs-on: ubuntu-latest
timeout-minutes: 120
timeout-minutes: 150
steps:
- uses: actions/checkout@v2
- run: sudo npm install -g [email protected]
Expand Down Expand Up @@ -125,6 +125,12 @@ jobs:
echo "deleted-poms=$true_or_false" >> $GITHUB_OUTPUT
echo "deleted-poms_files=$file_list" >> $GITHUB_OUTPUT
doc_files=`python tools/update_modules_check/check_file_updates.py ua $workspace apache/dev origin/$current_branch "docs/**"`
true_or_false=${doc_files%%$'\n'*}
file_list=${doc_files#*$'\n'}
echo "docs=$true_or_false" >> $GITHUB_OUTPUT
echo "docs_files=$file_list" >> $GITHUB_OUTPUT
engine_e2e_files=`python tools/update_modules_check/check_file_updates.py ua $workspace apache/dev origin/$current_branch "seatunnel-e2e/seatunnel-engine-e2e/**"`
true_or_false=${engine_e2e_files%%$'\n'*}
file_list=${engine_e2e_files#*$'\n'}
Expand Down Expand Up @@ -268,6 +274,65 @@ jobs:
- name: Check Dependencies Licenses
run: tools/dependencies/checkLicense.sh

document:
if: needs.changes.outputs.api == 'true' || needs.changes.outputs.docs == 'true'
needs: [ changes, sanity-check ]
name: Build website
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Checkout PR
uses: actions/checkout@v3
with:
path: seatunnel-pr
- name: Checkout website repo
uses: actions/checkout@v3
with:
repository: apache/seatunnel-website
path: seatunnel-website
- name: Sync PR changes to website
run: |
bash seatunnel-pr/tools/documents/sync.sh seatunnel-pr seatunnel-website
- uses: actions/setup-node@v2
with:
node-version: 16.19.0
- name: Run docusaurus build
run: |
cd seatunnel-website
npm set strict-ssl false
npm install
npm run build
seatunnel-ui:
if: needs.changes.outputs.api == 'true'
needs: [ changes, sanity-check ]
name: Build SeaTunnel UI
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Checkout PR
uses: actions/checkout@v3

- uses: actions/setup-node@v2
with:
node-version: 20.x

- name: Install Dependencies and Check Code Style
run: |
cd seatunnel-engine/seatunnel-engine-ui/
npm install
npm run lint
- name: Run unit tests
run: |
cd seatunnel-engine/seatunnel-engine-ui/
npm run test:unit
- name: Build SeaTunnel UI
run: |
cd seatunnel-engine/seatunnel-engine-ui/
npm run build
unit-test:
needs: [ changes, sanity-check ]
if: needs.changes.outputs.api == 'true' || (needs.changes.outputs.api == 'false' && needs.changes.outputs.ut-modules != '')
Expand Down Expand Up @@ -299,7 +364,7 @@ jobs:
matrix:
java: [ '8', '11' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 120
timeout-minutes: 180
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
Expand Down Expand Up @@ -330,7 +395,7 @@ jobs:
matrix:
java: [ '8', '11' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 120
timeout-minutes: 150
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
Expand All @@ -351,7 +416,7 @@ jobs:
echo "sub modules is empty, skipping"
fi
env:
MAVEN_OPTS: -Xmx2048m
MAVEN_OPTS: -Xmx4096m

updated-modules-integration-test-part-3:
needs: [ changes, sanity-check ]
Expand Down Expand Up @@ -392,7 +457,7 @@ jobs:
matrix:
java: [ '8', '11' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 120
timeout-minutes: 150
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
Expand All @@ -413,7 +478,7 @@ jobs:
echo "sub modules is empty, skipping"
fi
env:
MAVEN_OPTS: -Xmx2048m
MAVEN_OPTS: -Xmx4096m
updated-modules-integration-test-part-5:
needs: [ changes, sanity-check ]
if: needs.changes.outputs.api == 'false' && needs.changes.outputs.it-modules != ''
Expand Down Expand Up @@ -683,7 +748,7 @@ jobs:
matrix:
java: [ '8', '11' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 150
timeout-minutes: 180
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
Expand Down
66 changes: 0 additions & 66 deletions .github/workflows/documents.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/workflows/labeler/label-scope-conf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ http:
- changed-files:
- any-glob-to-any-file: seatunnel-connectors-v2/connector-http/**
- all-globs-to-all-files: '!seatunnel-connectors-v2/connector-!(http)/**'
prometheus:
- all:
- changed-files:
- any-glob-to-any-file: seatunnel-connectors-v2/connector-prometheus/**
- all-globs-to-all-files: '!seatunnel-connectors-v2/connector-!(prometheus)/**'
hudi:
- all:
- changed-files:
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,8 @@ seatunnel-examples

/lib/*
version.properties
node/

dist/

seatunnel-engine/seatunnel-engine-server/**/ui/*
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ Companies and organizations worldwide use SeaTunnel for research, production, an

### 1. How do I install SeaTunnel?

Follow the [Installation Guide](https://seatunnel.apache.org/docs/2.3.3/start-v2/locally/deployment/) on our website to get started.
Follow the [Installation Guide](https://seatunnel.apache.org/docs/start-v2/locally/deployment/) on our website to get
started.

### 2. How can I contribute to SeaTunnel?

Expand Down
4 changes: 2 additions & 2 deletions bin/install-plugin.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ REM Get seatunnel home
set "SEATUNNEL_HOME=%~dp0..\"
echo Set SEATUNNEL_HOME to [%SEATUNNEL_HOME%]

REM Connector default version is 2.3.8, you can also choose a custom version. eg: 2.3.8: install-plugin.bat 2.3.8
set "version=2.3.8"
REM Connector default version is 2.3.9, you can also choose a custom version. eg: 2.3.9: install-plugin.bat 2.3.9
set "version=2.3.9"
if not "%~1"=="" set "version=%~1"

REM Create the lib directory
Expand Down
4 changes: 2 additions & 2 deletions bin/install-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
# get seatunnel home
SEATUNNEL_HOME=$(cd $(dirname $0);cd ../;pwd)

# connector default version is 2.3.8, you can also choose a custom version. eg: 2.3.8: sh install-plugin.sh 2.3.8
version=2.3.8
# connector default version is 2.3.9, you can also choose a custom version. eg: 2.3.9: sh install-plugin.sh 2.3.9
version=2.3.9

if [ -n "$1" ]; then
version="$1"
Expand Down
1 change: 1 addition & 0 deletions config/plugin_config
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ connector-tdengine
connector-web3j
connector-milvus
connector-activemq
connector-prometheus
connector-sls
connector-qdrant
connector-typesense
Expand Down
4 changes: 4 additions & 0 deletions config/seatunnel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

seatunnel:
engine:
classloader-cache-mode: true
history-job-expire-minutes: 1440
backup-count: 1
queue-type: blockingqueue
Expand All @@ -37,6 +38,9 @@ seatunnel:
telemetry:
metric:
enabled: false
log:
scheduled-deletion-enable: true
http:
enable-http: true
port: 8080
enable-dynamic-port: false
Loading

0 comments on commit 307a617

Please sign in to comment.