Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: use java-shared-dependencies in google-cloud-java repository for downstream test #1291

Merged
merged 2 commits into from
Feb 1, 2023
Merged

ci: use java-shared-dependencies in google-cloud-java repository for downstream test #1291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa9dee0
ci: use java-shared-dependencies in google-cloud-java
suztomo Feb 1, 2023
8395f00
No need to modify google-cloud-jar-parent
suztomo Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions .kokoro/presubmit/downstream-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ GAPIC_BOM_VERSION=$(sed -e 's/xmlns=".*"//' gapic-generator-java-bom/pom.xml | x

### Round 2
# Run the updated GAPIC BOM against HEAD of java-shared-dependencies
git clone "https://github.com/googleapis/java-shared-dependencies.git" --depth=1
pushd java-shared-dependencies/first-party-dependencies
git clone "https://github.com/googleapis/google-cloud-java.git" --depth=1
pushd google-cloud-java/java-shared-dependencies/first-party-dependencies
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's working. The log shows;

diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml
index 0bf109d..6598701 100644
--- a/java-shared-dependencies/first-party-dependencies/pom.xml
+++ b/java-shared-dependencies/first-party-dependencies/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>first-party-dependencies</artifactId>
@@ -36,7 +34,7 @@
         <!-- This BOM declares the versions gRPC, Protobuf, Guava, etc. -->
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java-bom</artifactId>
-        <version>${gapic-generator-java-bom.version}</version>
+        <version>2.14.1-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>


# Replace GAPIC BOM version
xmllint --shell pom.xml <<EOF
Expand All @@ -55,41 +55,36 @@ echo "Modifications to java-shared-dependencies:"
git diff
echo

cd ..
mvn verify install -B -V -ntp -fae \
-DskipTests=true \
-Dmaven.javadoc.skip=true \
-Dgcloud.download.skip=true \
-Denforcer.skip=true

# Namespace (xmlns) prevents xmllint from specifying tag names in XPath
SHARED_DEPS_VERSION=$(sed -e 's/xmlns=".*"//' pom.xml | xmllint --xpath '/project/version/text()' -)

if [ -z "${SHARED_DEPS_VERSION}" ]; then
echo "Shared dependencies version is not found in pom.xml"
exit 1
fi

popd
pushd google-cloud-java
mvn -B -V -ntp install --also-make --projects \
java-shared-dependencies,java-shared-dependencies/first-party-dependencies,java-shared-dependencies/third-party-dependencies \
-DskipTests=true \
-Dmaven.javadoc.skip=true \
-Dgcloud.download.skip=true \
-Denforcer.skip=true

### Round 3
# Run the updated java-shared-dependencies BOM against google-cloud-java
git clone "https://github.com/googleapis/google-cloud-java.git" --depth=1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memo: this is now already checked out in previous step.

pushd google-cloud-java/google-cloud-jar-parent

# Replace java-shared-dependencies version
xmllint --shell pom.xml <<EOF
setns x=http://maven.apache.org/POM/4.0.0
cd .//x:artifactId[text()="google-cloud-shared-dependencies"]
cd ../x:version
set ${SHARED_DEPS_VERSION}
save pom.xml
EOF
# Install google-cloud-core-bom (part of java-shared-dependencies)
echo "Installing java-core"
mvn -B -V -ntp install -DskipTests --also-make -f java-core \
-DskipTests=true \
-Dmaven.javadoc.skip=true \
-Dgcloud.download.skip=true \
-Denforcer.skip=true
popd

echo "Modifications to google-cloud-java:"
git diff
echo
### Round 4
# Run the updated java-shared-dependencies BOM against google-cloud-java
pushd google-cloud-java

cd ..
source ./.kokoro/common.sh
RETURN_CODE=0
setup_application_credentials
Expand Down