From 357793d1c735c51898273b17f3853465c00d91e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ljubo=20Nikoli=C4=87?= Date: Wed, 3 Apr 2024 12:20:09 +0200 Subject: [PATCH 1/4] fix Node16 warnings --- .github/actions/build-whl/action.yml | 4 ++-- .github/actions/build/action.yml | 2 +- .github/actions/check-compat/action.yml | 2 +- .github/actions/test-jvm/action.yml | 4 ++-- .github/actions/test-python/action.yml | 4 ++-- .github/workflows/build-snapshots.yml | 2 +- .github/workflows/check.yml | 6 +++--- .github/workflows/ci.yml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/actions/build-whl/action.yml b/.github/actions/build-whl/action.yml index 15c2f0e1..c0a7f309 100644 --- a/.github/actions/build-whl/action.yml +++ b/.github/actions/build-whl/action.yml @@ -36,7 +36,7 @@ runs: - name: Cache Maven packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-${{ hashFiles('pom.xml') }} @@ -44,7 +44,7 @@ runs: - name: Cache Pip packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-whl-${{ inputs.python-version }}-${{ inputs.spark-version }} diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index b2095153..187d018d 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -30,7 +30,7 @@ runs: - name: Cache Maven packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-${{ hashFiles('pom.xml') }} diff --git a/.github/actions/check-compat/action.yml b/.github/actions/check-compat/action.yml index 049ecc5e..75d778b4 100644 --- a/.github/actions/check-compat/action.yml +++ b/.github/actions/check-compat/action.yml @@ -36,7 +36,7 @@ runs: - name: Cache Maven packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-mvn-check-${{ inputs.spark-version }}-${{ inputs.scala-version }}-${{ hashFiles('pom.xml') }} diff --git a/.github/actions/test-jvm/action.yml b/.github/actions/test-jvm/action.yml index e7704023..66466e7c 100644 --- a/.github/actions/test-jvm/action.yml +++ b/.github/actions/test-jvm/action.yml @@ -38,7 +38,7 @@ runs: path: . - name: Cache Spark Binaries - uses: actions/cache@v3 + uses: actions/cache@v4 if: ( ! contains(inputs.spark-version, '-SNAPSHOT') ) with: path: ~/spark @@ -59,7 +59,7 @@ runs: - name: Cache Maven packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-${{ hashFiles('pom.xml') }} diff --git a/.github/actions/test-python/action.yml b/.github/actions/test-python/action.yml index 82a5039d..62436136 100644 --- a/.github/actions/test-python/action.yml +++ b/.github/actions/test-python/action.yml @@ -42,7 +42,7 @@ runs: - name: Cache Maven packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-mvn-build-${{ inputs.spark-version }}-${{ inputs.scala-version }}-${{ hashFiles('pom.xml') }} @@ -56,7 +56,7 @@ runs: - name: Cache Pip packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-test-${{ inputs.python-version }}-${{ hashFiles(format('python/requirements-{0}_{1}.txt', inputs.spark-compat-version, inputs.scala-compat-version)) }} diff --git a/.github/workflows/build-snapshots.yml b/.github/workflows/build-snapshots.yml index 16e87386..dca7178d 100644 --- a/.github/workflows/build-snapshots.yml +++ b/.github/workflows/build-snapshots.yml @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build uses: ./.github/actions/build diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 341070a3..6c93665e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -10,19 +10,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Cache Maven packages if: github.event_name != 'merge_group' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-mvn-lint-${{ hashFiles('pom.xml') }} - name: Setup JDK ${{ inputs.java-compat-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'zulu' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2069e73f..85bdb7a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Event File path: ${{ github.event_path }} From 8ea71506e1d1b3a745c9902cd089cf40ad5f6c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ljubo=20Nikoli=C4=87?= Date: Wed, 3 Apr 2024 12:29:25 +0200 Subject: [PATCH 2/4] test the workflow --- .github/workflows/build-jvm.yml | 1 + .github/workflows/build-python.yml | 1 + .github/workflows/build-snapshots.yml | 1 + .github/workflows/check.yml | 3 ++- .github/workflows/test-jvm.yml | 1 + .github/workflows/test-python.yml | 1 + .github/workflows/test-results.yml | 1 + .github/workflows/test-snapshots.yml | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-jvm.yml b/.github/workflows/build-jvm.yml index bd44f507..a4ecb2a2 100644 --- a/.github/workflows/build-jvm.yml +++ b/.github/workflows/build-jvm.yml @@ -2,6 +2,7 @@ name: Build JVM on: workflow_call: + pull_request: jobs: build: diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index c4a14bfd..cf2648a4 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -2,6 +2,7 @@ name: Build Python on: workflow_call: + pull_request: jobs: # pyspark is not available for snapshots or scala other than 2.12 diff --git a/.github/workflows/build-snapshots.yml b/.github/workflows/build-snapshots.yml index dca7178d..c7585415 100644 --- a/.github/workflows/build-snapshots.yml +++ b/.github/workflows/build-snapshots.yml @@ -2,6 +2,7 @@ name: Build Snapshots on: workflow_call: + pull_request: jobs: build: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6c93665e..00323b8e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,6 +2,7 @@ name: Check on: workflow_call: + pull_request: jobs: lint: @@ -73,7 +74,7 @@ jobs: name: Compat (Spark ${{ matrix.spark-compat-version }} Scala ${{ matrix.scala-compat-version }}) needs: config runs-on: ubuntu-latest - if: needs.config.outputs.major-version == needs.config.outputs.release-major-version + # if: needs.config.outputs.major-version == needs.config.outputs.release-major-version strategy: fail-fast: false diff --git a/.github/workflows/test-jvm.yml b/.github/workflows/test-jvm.yml index 34caa47a..c00bd896 100644 --- a/.github/workflows/test-jvm.yml +++ b/.github/workflows/test-jvm.yml @@ -2,6 +2,7 @@ name: Test JVM on: workflow_call: + pull_request: jobs: test: diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 444e80f5..00a32ef7 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -2,6 +2,7 @@ name: Test Python on: workflow_call: + pull_request: jobs: # pyspark is not available for snapshots or scala other than 2.12 diff --git a/.github/workflows/test-results.yml b/.github/workflows/test-results.yml index f061f60e..212fbe23 100644 --- a/.github/workflows/test-results.yml +++ b/.github/workflows/test-results.yml @@ -5,6 +5,7 @@ on: workflows: ["CI"] types: - completed + pull_request: permissions: {} jobs: diff --git a/.github/workflows/test-snapshots.yml b/.github/workflows/test-snapshots.yml index 2b7697a3..8ffe6ad4 100644 --- a/.github/workflows/test-snapshots.yml +++ b/.github/workflows/test-snapshots.yml @@ -2,6 +2,7 @@ name: Test Snapshots on: workflow_call: + pull_request: jobs: test: From 6549d2a01cc6540b32e32f0f352dc51d39963027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ljubo=20Nikoli=C4=87?= Date: Mon, 22 Apr 2024 14:09:51 +0200 Subject: [PATCH 3/4] update dawidd6/action-download-artifact to v3 --- .github/workflows/test-results.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-results.yml b/.github/workflows/test-results.yml index 212fbe23..d0d5ba20 100644 --- a/.github/workflows/test-results.yml +++ b/.github/workflows/test-results.yml @@ -5,7 +5,6 @@ on: workflows: ["CI"] types: - completed - pull_request: permissions: {} jobs: @@ -19,7 +18,7 @@ jobs: steps: - name: Download and Extract Artifacts - uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 + uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe with: run_id: ${{ github.event.workflow_run.id }} name: "^Event File$| Test Results " From 6aeffe1714fec6b765279929168b605eedad79d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ljubo=20Nikoli=C4=87?= Date: Mon, 22 Apr 2024 14:21:51 +0200 Subject: [PATCH 4/4] remove conditions --- .github/workflows/build-jvm.yml | 1 - .github/workflows/build-python.yml | 1 - .github/workflows/build-snapshots.yml | 1 - .github/workflows/check.yml | 3 +-- .github/workflows/test-jvm.yml | 1 - .github/workflows/test-python.yml | 1 - .github/workflows/test-snapshots.yml | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build-jvm.yml b/.github/workflows/build-jvm.yml index a4ecb2a2..bd44f507 100644 --- a/.github/workflows/build-jvm.yml +++ b/.github/workflows/build-jvm.yml @@ -2,7 +2,6 @@ name: Build JVM on: workflow_call: - pull_request: jobs: build: diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml index cf2648a4..c4a14bfd 100644 --- a/.github/workflows/build-python.yml +++ b/.github/workflows/build-python.yml @@ -2,7 +2,6 @@ name: Build Python on: workflow_call: - pull_request: jobs: # pyspark is not available for snapshots or scala other than 2.12 diff --git a/.github/workflows/build-snapshots.yml b/.github/workflows/build-snapshots.yml index c7585415..dca7178d 100644 --- a/.github/workflows/build-snapshots.yml +++ b/.github/workflows/build-snapshots.yml @@ -2,7 +2,6 @@ name: Build Snapshots on: workflow_call: - pull_request: jobs: build: diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 00323b8e..6c93665e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -2,7 +2,6 @@ name: Check on: workflow_call: - pull_request: jobs: lint: @@ -74,7 +73,7 @@ jobs: name: Compat (Spark ${{ matrix.spark-compat-version }} Scala ${{ matrix.scala-compat-version }}) needs: config runs-on: ubuntu-latest - # if: needs.config.outputs.major-version == needs.config.outputs.release-major-version + if: needs.config.outputs.major-version == needs.config.outputs.release-major-version strategy: fail-fast: false diff --git a/.github/workflows/test-jvm.yml b/.github/workflows/test-jvm.yml index c00bd896..34caa47a 100644 --- a/.github/workflows/test-jvm.yml +++ b/.github/workflows/test-jvm.yml @@ -2,7 +2,6 @@ name: Test JVM on: workflow_call: - pull_request: jobs: test: diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 00a32ef7..444e80f5 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -2,7 +2,6 @@ name: Test Python on: workflow_call: - pull_request: jobs: # pyspark is not available for snapshots or scala other than 2.12 diff --git a/.github/workflows/test-snapshots.yml b/.github/workflows/test-snapshots.yml index 8ffe6ad4..2b7697a3 100644 --- a/.github/workflows/test-snapshots.yml +++ b/.github/workflows/test-snapshots.yml @@ -2,7 +2,6 @@ name: Test Snapshots on: workflow_call: - pull_request: jobs: test: