mirror of https://github.com/apache/nifi.git
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 <exceptionfactory@apache.org> Signed-off-by: Joe Witt <joewitt@apache.org>
This commit is contained in:
parent
7ec2dd07c9
commit
202ca3c638
|
@ -97,7 +97,7 @@ jobs:
|
||||||
# Cache Maven modules using a cache key different from setup-java steps
|
# Cache Maven modules using a cache key different from setup-java steps
|
||||||
key: ${{ runner.os }}-maven-static-analysis-${{ hashFiles('**/pom.xml') }}
|
key: ${{ runner.os }}-maven-static-analysis-${{ hashFiles('**/pom.xml') }}
|
||||||
- name: Set up Java 21
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
|
@ -145,7 +145,7 @@ jobs:
|
||||||
**/node_modules
|
**/node_modules
|
||||||
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
||||||
- name: Set up Java 21
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'corretto'
|
distribution: 'corretto'
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
|
@ -188,7 +188,7 @@ jobs:
|
||||||
|
|
||||||
macos-build-jp:
|
macos-build-jp:
|
||||||
timeout-minutes: 150
|
timeout-minutes: 150
|
||||||
runs-on: macos-latest
|
runs-on: macos-14
|
||||||
name: MacOS Zulu JDK 21 JP
|
name: MacOS Zulu JDK 21 JP
|
||||||
steps:
|
steps:
|
||||||
- name: System Information
|
- name: System Information
|
||||||
|
@ -207,7 +207,7 @@ jobs:
|
||||||
**/node_modules
|
**/node_modules
|
||||||
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
||||||
- name: Set up Java 21
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
|
@ -274,7 +274,7 @@ jobs:
|
||||||
**\node_modules
|
**\node_modules
|
||||||
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
||||||
- name: Set up Java 21
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '21'
|
java-version: '21'
|
||||||
|
|
|
@ -47,7 +47,7 @@ jobs:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Java Zulu 21
|
- name: Set up Java Zulu 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: 21
|
java-version: 21
|
||||||
|
|
|
@ -107,7 +107,7 @@ jobs:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Java Zulu 21
|
- name: Set up Java Zulu 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: 21
|
java-version: 21
|
||||||
|
|
|
@ -99,7 +99,7 @@ jobs:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Java Zulu 21
|
- name: Set up Java Zulu 21
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: 21
|
java-version: 21
|
||||||
|
|
|
@ -77,7 +77,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ ubuntu-latest, macos-latest ]
|
os: [ ubuntu-latest, macos-14 ]
|
||||||
version: [ 21 ]
|
version: [ 21 ]
|
||||||
timeout-minutes: 120
|
timeout-minutes: 120
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
@ -98,16 +98,16 @@ jobs:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Java ${{ env.JAVA_DISTRIBUTION }} ${{ matrix.version }}
|
- name: Set up Java ${{ env.JAVA_DISTRIBUTION }} ${{ matrix.version }}
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: ${{ env.JAVA_DISTRIBUTION }}
|
distribution: ${{ env.JAVA_DISTRIBUTION }}
|
||||||
java-version: ${{ matrix.version }}
|
java-version: ${{ matrix.version }}
|
||||||
cache: 'maven'
|
cache: 'maven'
|
||||||
|
|
||||||
- name: Set up Python 3.9
|
- name: Set up Python 3.10
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.9'
|
python-version: '3.10'
|
||||||
|
|
||||||
- name: Build Dependencies
|
- name: Build Dependencies
|
||||||
env:
|
env:
|
||||||
|
|
Loading…
Reference in New Issue