From 202ca3c638a5eaf986c9b74994c93a15fbac9b35 Mon Sep 17 00:00:00 2001 From: exceptionfactory Date: Tue, 6 Feb 2024 22:47:52 -0600 Subject: [PATCH] NIFI-12752 Updated GitHub Workflows to use macos-14 - Upgraded setup-java action from v3 to v4 - Upgraded setup-python action from v4 to v5 - Updated system-tests to use Python 3.10 instead of Python 3.9 This closes #8371 Signed-off-by: David Handermann Signed-off-by: Joe Witt --- .github/workflows/ci-workflow.yml | 10 +++++----- .github/workflows/dependency-check.yml | 2 +- .github/workflows/docker-tests.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- .github/workflows/system-tests.yml | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 6e8a0cdbf1..e357aed12c 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -97,7 +97,7 @@ jobs: # Cache Maven modules using a cache key different from setup-java steps key: ${{ runner.os }}-maven-static-analysis-${{ hashFiles('**/pom.xml') }} - name: Set up Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' @@ -145,7 +145,7 @@ jobs: **/node_modules key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} - name: Set up Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'corretto' java-version: '21' @@ -188,7 +188,7 @@ jobs: macos-build-jp: timeout-minutes: 150 - runs-on: macos-latest + runs-on: macos-14 name: MacOS Zulu JDK 21 JP steps: - name: System Information @@ -207,7 +207,7 @@ jobs: **/node_modules key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} - name: Set up Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' @@ -274,7 +274,7 @@ jobs: **\node_modules key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} - name: Set up Java 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '21' diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 1829c157ad..c066c2963f 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -47,7 +47,7 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - name: Set up Java Zulu 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml index 6c085c7874..9a2161a75b 100644 --- a/.github/workflows/docker-tests.yml +++ b/.github/workflows/docker-tests.yml @@ -107,7 +107,7 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - name: Set up Java Zulu 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 583323cdb0..209a512516 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -99,7 +99,7 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - name: Set up Java Zulu 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index ec82be7278..9cc8e36069 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -77,7 +77,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ ubuntu-latest, macos-14 ] version: [ 21 ] timeout-minutes: 120 runs-on: ${{ matrix.os }} @@ -98,16 +98,16 @@ jobs: - name: Checkout Code uses: actions/checkout@v4 - name: Set up Java ${{ env.JAVA_DISTRIBUTION }} ${{ matrix.version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ env.JAVA_DISTRIBUTION }} java-version: ${{ matrix.version }} cache: 'maven' - - name: Set up Python 3.9 - uses: actions/setup-python@v4 + - name: Set up Python 3.10 + uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.10' - name: Build Dependencies env: