Merge remote-tracking branch 'upstream/dev' into zsh-pr-11134
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index dd76760..3c6378f 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml
@@ -38,7 +38,7 @@ runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Check license header @@ -49,7 +49,7 @@ runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Check code style @@ -94,8 +94,11 @@ steps: - uses: actions/checkout@v4 - name: Setup Helm - uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 - id: install + run: | + if ! command -v helm >/dev/null 2>&1; then + curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash + fi + helm version - name: Lint Chart run: helm lint deploy/kubernetes/seatunnel @@ -106,7 +109,7 @@ # Temporarily ignore this job to avoid blocking PRs continue-on-error: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: sudo npm install -g markdown-link-check@3.8.7 - run: | for file in $(find . -name "*.md"); do @@ -146,7 +149,7 @@ /usr/bin/git checkout apache/dev /usr/bin/git checkout '${{ github.ref }}' echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11.0' - name: Check for file changes by python @@ -289,9 +292,9 @@ - name: Make integration test modules id: it-modules timeout-minutes: 60 - if: ${{ steps.filter.outputs.api == 'false' && (steps.engine-modules.outputs.modules != '' || steps.cv2-modules.outputs.modules != '' || steps.cv2-e2e-modules.outputs.modules != '' || steps.cv2-flink-e2e-modules.outputs.modules != '' || steps.cv2-spark-e2e-modules.outputs.modules != '') }} + if: ${{ steps.filter.outputs.api == 'false' && (steps.engine-modules.outputs.modules != '' || steps.cv2-modules.outputs.modules != '' || steps.cv2-e2e-modules.outputs.modules != '' || steps.engine-e2e-modules.outputs.modules != '') }} run: | - modules='${{ steps.cv2-e2e-modules.outputs.modules }}${{ steps.cv2-flink-e2e-modules.outputs.modules }}${{ steps.cv2-spark-e2e-modules.outputs.modules }}${{ steps.engine-e2e-modules.outputs.modules }}${{ steps.engine-modules.outputs.modules }}${{ steps.cv2-modules.outputs.modules }}' + modules='${{ steps.cv2-e2e-modules.outputs.modules }}${{ steps.engine-e2e-modules.outputs.modules }}${{ steps.engine-modules.outputs.modules }}${{ steps.cv2-modules.outputs.modules }}' modules=${modules: 1} pl_modules=`python tools/update_modules_check/update_modules_check.py replace "$modules"` # remove deleted modules @@ -307,8 +310,6 @@ engine_modules='${{ steps.engine-modules.outputs.modules }}' connector_modules='${{ steps.cv2-modules.outputs.modules }}' connector_modules="$connector_modules"'${{ steps.cv2-e2e-modules.outputs.modules }}' - connector_modules="$connector_modules"'${{ steps.cv2-flink-e2e-modules.outputs.modules }}' - connector_modules="$connector_modules"'${{ steps.cv2-spark-e2e-modules.outputs.modules }}' engine_e2e_modules='${{ steps.engine-e2e-modules.outputs.modules }}' if [[ "zz${connector_modules}${engine_e2e_modules}" == "zz" && "zz"$engine_modules != "zz" ]];then # Engine changes already trigger the broad downstream integration jobs through engine=true. @@ -334,16 +335,16 @@ runs-on: ubuntu-latest timeout-minutes: 60 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' cache: 'maven' - name: Install - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: timeout_minutes: 40 max_attempts: 3 @@ -361,24 +362,24 @@ timeout-minutes: 90 steps: - name: Checkout PR - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: seatunnel-pr - name: Checkout website repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 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 + - uses: actions/setup-node@v4 with: node-version: 18.20.7 - name: Run docusaurus build env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} run: | cd seatunnel-website npm set strict-ssl false @@ -393,8 +394,8 @@ timeout-minutes: 60 steps: - name: Checkout PR - uses: actions/checkout@v3 - - uses: actions/setup-node@v2 + uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 20.x - name: Install Dependencies and Check Code Style @@ -421,9 +422,9 @@ os: [ 'ubuntu-latest', 'windows-latest' ] timeout-minutes: 90 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -444,9 +445,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -475,9 +476,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -506,9 +507,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -537,9 +538,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 200 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -567,9 +568,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -597,9 +598,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -627,9 +628,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -658,9 +659,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -689,9 +690,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 150 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -722,11 +723,11 @@ cp /etc/rancher/k3s/k3s.yaml ~/.kube/config env: KUBECONFIG: /etc/rancher/k3s/k3s.yaml - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: free disk space run: tools/github/free_disk_space.sh - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -751,9 +752,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -779,9 +780,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 150 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -807,9 +808,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -838,9 +839,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -876,9 +877,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -907,9 +908,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 270 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -938,9 +939,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 270 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -969,9 +970,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1000,9 +1001,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1031,9 +1032,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1060,9 +1061,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1088,9 +1089,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1116,9 +1117,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1144,9 +1145,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1172,9 +1173,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1200,9 +1201,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1228,9 +1229,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1256,9 +1257,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1282,9 +1283,9 @@ # Kudu E2E expands each @TestTemplate case across several PR test containers. timeout-minutes: 90 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1307,9 +1308,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1332,9 +1333,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1357,9 +1358,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1383,9 +1384,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1408,9 +1409,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1434,9 +1435,9 @@ timeout-minutes: 210 steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1463,9 +1464,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1488,9 +1489,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 120 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1513,9 +1514,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 210 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' @@ -1538,9 +1539,9 @@ os: [ 'ubuntu-latest' ] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin'
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index f481694..d5110c5 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml
@@ -27,6 +27,7 @@ jobs: call-build-and-test: permissions: + contents: read packages: write name: Run uses: ./.github/workflows/backend.yml
diff --git a/.github/workflows/notify_test_workflow.yml b/.github/workflows/notify_test_workflow.yml index a517a03..2a0d172 100644 --- a/.github/workflows/notify_test_workflow.yml +++ b/.github/workflows/notify_test_workflow.yml
@@ -36,7 +36,7 @@ checks: write steps: - name: "Notify test workflow" - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | @@ -109,31 +109,33 @@ } }) } else { - const run_id = runs.data.workflow_runs[0].id + const build_run = runs.data.workflow_runs[0] + const run_id = build_run.id - if (runs.data.workflow_runs[0].head_sha != context.payload.pull_request.head.sha) { + if (build_run.head_sha != context.payload.pull_request.head.sha) { throw new Error('There was a new unsynced commit pushed. Please retrigger the workflow.'); } // Here we get check run ID to provide Check run view instead of Actions view, see also SPARK-37879. const check_runs = await github.request(check_run_endpoint, check_run_params) console.log('check_runs: ' + JSON.stringify(check_runs)) - const check_run_head = check_runs.data.check_runs.filter(r => r.name === "Run / License header")[0] - - console.log('check_run_head: ' + JSON.stringify(check_run_head)) - if (check_run_head.head_sha != context.payload.pull_request.head.sha) { - throw new Error('There was a new unsynced commit pushed. Please retrigger the workflow.'); - } - - const check_run_url = 'https://github.com/' - + context.payload.pull_request.head.repo.full_name - + '/runs/' - + check_run_head.id - const actions_url = 'https://github.com/' + context.payload.pull_request.head.repo.full_name + '/actions/runs/' + run_id + const run_url_part = '/actions/runs/' + run_id + const check_run_head = check_runs.data.check_runs.find(r => + r.head_sha === build_run.head_sha + && ( + (r.details_url && r.details_url.includes(run_url_part)) + || (r.html_url && r.html_url.includes(run_url_part)) + ) + ) + + console.log('check_run_head: ' + JSON.stringify(check_run_head)) + const check_run_url = check_run_head + ? (check_run_head.html_url || check_run_head.details_url || actions_url) + : actions_url await github.rest.checks.create({ owner: context.repo.owner,
diff --git a/.github/workflows/schedule_backend.yml b/.github/workflows/schedule_backend.yml index 9a6aa1c..b513ba6 100644 --- a/.github/workflows/schedule_backend.yml +++ b/.github/workflows/schedule_backend.yml
@@ -27,8 +27,9 @@ jobs: call-build-and-test: permissions: + contents: read packages: write name: Run uses: ./.github/workflows/backend.yml with: - TEST_IN_PR: false + TEST_IN_PR: ${{ 'false' }}