Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
chore: regenerate common templates (#80)
Browse files Browse the repository at this point in the history
* cleanup: removes unused kokoro config files

* cleanup: removes unused kokoro config files

Removes unused kokoro files from the java library template. We have
stopped running some of these due to Github quota issues.

* fix:reverts back samples.cfg files

The files presubmit/samples.cfg and nightly/samples.cfg should remain in
the java template repository.

Co-authored-by: Jeffrey Rennie <rennie@google.com>

Source-Author: Thiago Nunes <thiagotnunes@gmail.com>
Source-Date: Thu Aug 6 09:48:58 2020 +1000
Source-Repo: googleapis/synthtool
Source-Sha: 4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4
Source-Link: googleapis/synthtool@4530cc6

* build: update dependencies check to only check for runtime and compile scopes

* change:Updated dependencies check to only use runtime & compile scope

* Update dependencies.sh

* feat: update dependencies check to only check for runtime and compile
scopes

Co-authored-by: Saleh Mostafa <salehmostafa@google.com>
Co-authored-by: Jeffrey Rennie <rennie@google.com>

Source-Author: salehsquared <salehmostafamain@gmail.com>
Source-Date: Thu Aug 6 13:01:02 2020 -0400
Source-Repo: googleapis/synthtool
Source-Sha: f8823dec98277a9516f2fb6fae9f58b3a59a23e1
Source-Link: googleapis/synthtool@f8823de
  • Loading branch information
yoshi-automation authored Aug 7, 2020
1 parent b7b8c08 commit 992b390
Show file tree
Hide file tree
Showing 13 changed files with 7 additions and 178 deletions.
12 changes: 0 additions & 12 deletions .kokoro/continuous/dependencies.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/integration.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/java11.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .kokoro/continuous/java7.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions .kokoro/continuous/java8-osx.cfg

This file was deleted.

3 changes: 0 additions & 3 deletions .kokoro/continuous/java8-win.cfg

This file was deleted.

13 changes: 0 additions & 13 deletions .kokoro/continuous/lint.cfg

This file was deleted.

53 changes: 0 additions & 53 deletions .kokoro/continuous/propose_release.cfg

This file was deleted.

31 changes: 0 additions & 31 deletions .kokoro/continuous/samples.cfg

This file was deleted.

9 changes: 5 additions & 4 deletions .kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ function completenessCheck() {
# Output dep list with compile scope generated using the original pom
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt

# Output dep list generated using the flattened pom (test scope deps are ommitted)
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt

# Compare two dependency lists
msg "Comparing dependency lists..."
Expand Down Expand Up @@ -85,4 +86,4 @@ then
else
msg "Errors found. See log statements above."
exit 1
fi
fi
12 changes: 0 additions & 12 deletions .kokoro/nightly/dependencies.cfg

This file was deleted.

13 changes: 0 additions & 13 deletions .kokoro/nightly/lint.cfg

This file was deleted.

15 changes: 2 additions & 13 deletions synth.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-os-config.git",
"sha": "ddbab60d6472612f6091833b9ad34c46a9d8caf2"
"sha": "b7b8c087b16eb2e88e09942735b6802121f99b64"
}
},
{
Expand All @@ -19,7 +19,7 @@
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "dd230c816f88d0141fcd0be83498986287220d1b"
"sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1"
}
}
],
Expand Down Expand Up @@ -49,27 +49,16 @@
".kokoro/common.cfg",
".kokoro/common.sh",
".kokoro/continuous/common.cfg",
".kokoro/continuous/dependencies.cfg",
".kokoro/continuous/integration.cfg",
".kokoro/continuous/java11.cfg",
".kokoro/continuous/java7.cfg",
".kokoro/continuous/java8-osx.cfg",
".kokoro/continuous/java8-win.cfg",
".kokoro/continuous/java8.cfg",
".kokoro/continuous/lint.cfg",
".kokoro/continuous/propose_release.cfg",
".kokoro/continuous/samples.cfg",
".kokoro/dependencies.sh",
".kokoro/linkage-monitor.sh",
".kokoro/nightly/common.cfg",
".kokoro/nightly/dependencies.cfg",
".kokoro/nightly/integration.cfg",
".kokoro/nightly/java11.cfg",
".kokoro/nightly/java7.cfg",
".kokoro/nightly/java8-osx.cfg",
".kokoro/nightly/java8-win.cfg",
".kokoro/nightly/java8.cfg",
".kokoro/nightly/lint.cfg",
".kokoro/nightly/samples.cfg",
".kokoro/populate-secrets.sh",
".kokoro/presubmit/clirr.cfg",
Expand Down

0 comments on commit 992b390

Please sign in to comment.