Skip to content

Commit 4381a8f

Browse files
committed
decouple BeamModulePlugin and setup-environment-action from GHA infra
1 parent 978868b commit 4381a8f

5 files changed

Lines changed: 5 additions & 17 deletions

File tree

.github/actions/setup-environment-action/action.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ runs:
6969
tox-${{ runner.os }}-py${{ inputs.python-version == 'default' && '310' || inputs.python-version }}-${{ hashFiles('sdks/python/tox.ini') }}-
7070
tox-${{ runner.os }}-py${{ inputs.python-version == 'default' && '310' || inputs.python-version }}-
7171
72-
- name: Install Java 17 fallback
73-
if: ${{ inputs.java-version == 'default' }}
74-
uses: actions/setup-java@v4
75-
with:
76-
distribution: 'temurin'
77-
java-version: '17'
7872
- name: Install Java
7973
if: ${{ inputs.java-version != '' }}
8074
uses: actions/setup-java@v4

.github/workflows/beam_PerformanceTests_xlang_KafkaIO_Python.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ jobs:
182182
uses: ./.github/actions/gradle-command-self-hosted-action
183183
with:
184184
gradle-command: :sdks:java:io:expansion-service:shadowJar
185+
arguments: |
186+
-Pjava17Home=$JAVA_HOME_17_X64
185187
# The env variable is created and populated in the test-arguments-action as "<github.job>_test_arguments_<argument_file_paths_index>"
186188
- name: run integrationTest
187189
uses: ./.github/actions/gradle-command-self-hosted-action

.github/workflows/beam_PreCommit_Yaml_Xlang_Direct.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ jobs:
9595
uses: ./.github/actions/gradle-command-self-hosted-action
9696
with:
9797
gradle-command: :sdks:python:yamlIntegrationTests -PbeamPythonExtra=p310_ml_test,yaml
98+
arguments: |
99+
-Pjava17Home=$JAVA_HOME_17_X64
98100
- name: Archive Python Test Results
99101
uses: actions/upload-artifact@v7
100102
if: failure()

.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ jobs:
122122
with:
123123
gradle-command: :sdks:${{ matrix.container_task }}
124124
arguments: |
125+
-Pjava17Home=$JAVA_HOME_17_X64 \
125126
-Pdocker-repository-root=gcr.io/apache-beam-testing/beam-sdk \
126127
-Pdocker-tag-list=${{ github.sha }},${BEAM_VERSION}${LATEST_TAG} \
127128
-Pcontainer-architecture-list=arm64,amd64 \

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -507,17 +507,6 @@ class BeamModulePlugin implements Plugin<Project> {
507507

508508
project.ext.mavenGroupId = 'org.apache.beam'
509509

510-
['11', '17', '21', '25'].each { version ->
511-
def propName = "java${version}Home"
512-
if (!project.hasProperty(propName)) {
513-
def home = System.getenv("JAVA_HOME_${version}_X64") ?:
514-
(System.getenv("JAVA_HOME_${version}_ARM64") ?: System.getenv("JAVA_HOME_${version}_arm64"))
515-
if (home) {
516-
project.ext.set(propName, home)
517-
}
518-
}
519-
}
520-
521510
// Default to dash-separated directories for artifact base name,
522511
// which will also be the default artifactId for maven publications
523512
project.apply plugin: 'base'

0 commit comments

Comments
 (0)