Skip to content

Commit

Permalink
Move hardcoded version number as default version for setup-environmen…
Browse files Browse the repository at this point in the history
…t-action (#31199)

In preparation of using java11+ for testing and sunset Python 3.8
  • Loading branch information
Abacn authored May 7, 2024
1 parent 2ca9af8 commit f84f191
Show file tree
Hide file tree
Showing 103 changed files with 129 additions and 133 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"ESSENTIAL_VERSIONS": ["3.8", "3.11"],
"CROSS_LANGUAGE_VALIDATES_RUNNER_PYTHON_VERSIONS": ["3.8", "3.11"],
"CROSS_LANGUAGE_VALIDATES_RUNNER_DATAFLOW_USING_SQL_PYTHON_VERSIONS": ["3.11"],
"VALIDATES_CONTAINER_DATAFLOW_PYTHON_VERSIONS": ["3.8", "3.9", "3.10", "3.11" ]
"VALIDATES_CONTAINER_DATAFLOW_PYTHON_VERSIONS": ["3.8", "3.9", "3.10", "3.11" ],
"LOAD_TEST_PYTHON_VERSION": "3.8",
"CHICAGO_TAXI_EXAMPLE_FLINK_PYTHON_VERSION": "3.8",
"DEFAULT_INTERPRETER": "python3.8",
"TOX_ENV": ["Cloud", "Cython"]
},
"JavaTestProperties": {
"SUPPORTED_VERSIONS": ["8", "11", "17"],
"SUPPORTED_VERSIONS": ["8", "11", "17", "21"],
"FLINK_VERSIONS": ["1.14", "1.15", "1.16", "1.17"],
"SPARK_VERSIONS": ["2", "3"]
},
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/setup-environment-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ runs:
if: ${{ inputs.python-version != '' }}
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version }}
python-version: ${{ inputs.python-version == 'default' && '3.8' || inputs.python-version }}
- name: Install Java
if: ${{ inputs.java-version != '' }}
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ inputs.java-version }}
java-version: ${{ inputs.python-version == 'default' && '8' || inputs.java-version }}
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
Expand All @@ -57,4 +57,4 @@ runs:
if: ${{ inputs.go-version != '' }}
uses: actions/setup-go@v3
with:
go-version: ${{ inputs.go-version }} # never set patch, to get latest patch releases.
go-version: ${{ inputs.python-version == 'default' && '1.21' || inputs.go-version }} # never set patch, to get latest patch releases.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup Python environment
uses: ./.github/actions/setup-environment-action
with:
python-version: '3.8'
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_LoadTests_Python_Smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_Metrics_Report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Run Metrics Report
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Prepare test arguments
uses: ./.github/actions/test-arguments-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
python-version: 3.8
python-version: default
- name: Authenticate on GCP
id: auth
uses: google-github-actions/auth@v1
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/beam_Playground_CI_Nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,8 @@ jobs:
- uses: actions/checkout@v4
- name: Setup environment
uses: ./.github/actions/setup-environment-action
- name: Install Python 3.8
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: default
- name: Install requirements
run: |
cd $BEAM_ROOT_DIR/playground/infrastructure
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/beam_PostCommit_Go_Dataflow_ARM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
go-version: 1.21
java-version: default
go-version: default
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Authenticate on GCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
distribution: 'temurin'
java-version: |
${{ matrix.java_version }}
8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Examples_Direct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
java-version: default
- name: run examplesIntegrationTest script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/beam_PostCommit_Java_Examples_Flink.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
python-version: 3.8
java-version: default
python-version: default
- name: run examplesIntegrationTest script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Examples_Spark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
java-version: default
- name: run examplesIntegrationTest script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Hadoop_Versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
java-version: default
- name: run validatesRunner script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
java-version: default
- name: Authenticate on GCP
uses: google-github-actions/auth@v2
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
java-version: default
- name: run validatesRunner script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 8
java-version: default
- name: run validatesRunnerStreaming script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
Expand Down
Loading

0 comments on commit f84f191

Please sign in to comment.