Skip to content

Commit 4d915a3

Browse files
Neenu1995chanseokoh
andauthoredNov 21, 2021
chore: remove enable-samples profile (#1562)
* chore: removae enable-samples profile * chore: run test in snapshot * chore: install Spanner before running samples * Update .github/workflows/samples.yaml Co-authored-by: Chanseok Oh <chanseok@google.com> Co-authored-by: Chanseok Oh <chanseok@google.com>
1 parent e3aa0c2 commit 4d915a3

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed
 

‎.github/workflows/samples.yaml

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2
9-
- uses: stCarolas/setup-maven@v4
10-
with:
11-
maven-version: 3.8.1
129
- uses: actions/setup-java@v1
1310
with:
1411
java-version: 8
@@ -22,11 +19,11 @@ jobs:
2219
java: [8, 11]
2320
steps:
2421
- uses: actions/checkout@v2
25-
- uses: stCarolas/setup-maven@v4
26-
with:
27-
maven-version: 3.8.1
2822
- uses: actions/setup-java@v1
2923
with:
3024
java-version: ${{matrix.java}}
25+
- name: Compile Spanner
26+
run: mvn clean install
3127
- name: Compile samples
32-
run: mvn -Penable-samples compile
28+
run: mvn compile
29+
working-directory: samples

‎.kokoro/build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ samples)
103103

104104
pushd ${SAMPLES_DIR}
105105
mvn -B \
106-
-Penable-samples \
107106
-ntp \
108107
-DtrimStackTrace=false \
109108
-Dclirr.skip=true \

‎pom.xml

+1-9
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5555
<github.global.server>github</github.global.server>
5656
<site.installationModule>google-cloud-spanner-parent</site.installationModule>
57-
<google.cloud.shared-dependencies.version>2.4.0</google.cloud.shared-dependencies.version>
57+
<google.cloud.shared-dependencies.version>2.5.0</google.cloud.shared-dependencies.version>
5858
</properties>
5959

6060
<dependencyManagement>
@@ -224,12 +224,4 @@
224224
</plugins>
225225
</reporting>
226226

227-
<profiles>
228-
<profile>
229-
<id>enable-samples</id>
230-
<modules>
231-
<module>samples</module>
232-
</modules>
233-
</profile>
234-
</profiles>
235227
</project>

‎samples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Install [Maven](http://maven.apache.org/).
1717

1818
Build your project from the root directory (`java-spanner`):
1919

20-
mvn clean package -DskipTests -Penable-samples
20+
mvn clean package -DskipTests
2121

2222
Every subsequent command here should be run from a subdirectory (`cd samples/snippets`).
2323

0 commit comments

Comments
 (0)
Please sign in to comment.