From 5197d9cbe65e9b91c1da23737badd7ea60dd07a2 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 8 Oct 2021 14:48:29 -0700 Subject: [PATCH 1/2] ci: configure the protected branch (#309) --- .github/workflows/ci.yaml | 43 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f14a3e444..4b6bd5d55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,34 +1,33 @@ -on: +'on': push: branches: - - main - pull_request: + - 2.0.x + pull_request: null name: ci jobs: units: runs-on: ubuntu-latest env: - # Customize the JVM maximum heap limit - JVM_OPTS: -Xmx3200m + JVM_OPTS: '-Xmx3200m' TERM: dumb steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Gradle Assemble - run: ./gradlew assemble - - name: Gradle Test - run: ./gradlew test - - name: Gradle Build - run: ./gradlew build install + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - name: Gradle Assemble + run: ./gradlew assemble + - name: Gradle Test + run: ./gradlew test + - name: Gradle Build + run: ./gradlew build install format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Java Linter - run: ./gradlew googleJavaFormat \ No newline at end of file + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Java Linter + run: ./gradlew googleJavaFormat From ad2773d09a9495d74057670766c438c77334078d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 21:50:21 +0000 Subject: [PATCH 2/2] chore(2.0.x): release 2.0.6-SNAPSHOT (#310) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- build.gradle | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3361a3dec..085c83f7c 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin' group = "com.google.api" archivesBaseName = "api-common" -project.version = "2.0.5" // {x-version-update:api-common:current} +project.version = "2.0.6-SNAPSHOT" // {x-version-update:api-common:current} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/versions.txt b/versions.txt index fbd3c8618..dd4972cec 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -api-common:2.0.5:2.0.5 +api-common:2.0.5:2.0.6-SNAPSHOT