Skip to content

Commit 421a981

Browse files
Steve Vaughan JrGitHub Enterprise
authored andcommitted
build: Use Iceberg branch apple-1.5.0.x for 3.4 (i.e. 3.4.3) (apache#477)
The original proof of concept of the comet builds with Spark 3.4 were against an Iceberg `apple-1.3.x` branch derivative using a PR build. We should have moved on to `apple-1.5.x` for these test builds.
1 parent 423101b commit 421a981

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

‎rio.yaml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -642,18 +642,10 @@ builds:
642642
- ./mvnw versions:set -DnewVersion="$NEXT_VERSION"
643643
- PROFILES="${PROFILES}" make clean release
644644
- rm -rf apache-incubator-iceberg
645-
# FIXME Temporarily clone entire repo and then use PR
646-
#- git clone [email protected]:IPR/apache-incubator-iceberg.git --depth 1 --branch ${ICEBERG_BRANCH}
647-
- git clone [email protected]:IPR/apache-incubator-iceberg.git --branch ${ICEBERG_BRANCH}
645+
- git clone [email protected]:IPR/apache-incubator-iceberg.git --depth 1 --branch ${ICEBERG_BRANCH}
648646
- cd apache-incubator-iceberg
649647

650-
# FIXME .. and use PR
651-
- BUILD_PARAM_PR_NUMBER=1215
652-
- git fetch --force -q origin pull/${BUILD_PARAM_PR_NUMBER}/head:pr_${BUILD_PARAM_PR_NUMBER}
653-
- git checkout pr_${BUILD_PARAM_PR_NUMBER}
654-
- git log -n 1
655-
656-
- sed -i -E "s|(com.apple.pie.comet:comet-(common\|spark)-spark${COMET_TAG} = )(.*)|\1${NEXT_VERSION}|g" versions.props
648+
- sed -i -E "s|(org.apache.comet:comet-spark-spark.*:).*|\1${NEXT_VERSION}\"|g" spark/v3.4/build.gradle
657649
- ./gradlew ${PROXY_OPTS} -DscalaVersion=${ICEBERG_SCALA_VERSION} :iceberg-spark:iceberg-spark-${ICEBERG_TAG}:test :iceberg-spark:iceberg-spark-runtime-${ICEBERG_TAG}:test
658650
reports: &test_iceberg_reports
659651
junit:
@@ -700,7 +692,7 @@ builds:
700692
<<: *proxy_env
701693
PROFILES: "-Pspark-3.4"
702694
COMET_TAG: 3.4_2.12
703-
ICEBERG_BRANCH: apple-1.3.x
695+
ICEBERG_BRANCH: apple-1.5.0.x
704696
ICEBERG_TAG: 3.4_2.12
705697
ICEBERG_SCALA_VERSION: 2.12
706698
build:
@@ -719,7 +711,7 @@ builds:
719711
<<: *proxy_env
720712
PROFILES: "-Pspark-3.4,scala-2.13"
721713
COMET_TAG: 3.4_2.13
722-
ICEBERG_BRANCH: apple-1.3.x
714+
ICEBERG_BRANCH: apple-1.5.0.x
723715
ICEBERG_TAG: 3.4_2.13
724716
ICEBERG_SCALA_VERSION: 2.13
725717
build:

0 commit comments

Comments
 (0)