From 76e730690ccb0ac1db43a655881c83bee090c8b7 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 13:00:09 -0400 Subject: [PATCH 01/17] test workflow to add new tag to release --- ...reate_shared_dependencies_release_tag.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/create_shared_dependencies_release_tag.yaml diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml new file mode 100644 index 0000000000..f084bc843f --- /dev/null +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -0,0 +1,35 @@ +name: Create additional tag for each release with first_party_dependencies version + +on: + release: + types: [published] + workflow_dispatch: # If manually triggered, clarify which release to create the additional tag for + inputs: + releaseTag: + description: 'Release Tag' + required: true + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.releaseTag }} + + - name: Set up Git + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + + - name: Set up JDK 1.8 + uses: actions/setup-java@v3 + with: + java-version: 17 + + - name: Create additional tag + run: | + VERSION=$(mvn -f java-shared-dependencies/first-party-dependencies/pom.xml help:evaluate -Dexpression=project.dependencies.dependency[0].version -q -DforceStdout) + git tag google-cloud-shared-dependencies/v$VERSION ${{ github.event.inputs.releaseTag }} + git push origin google-cloud-shared-dependencies/v$VERSION \ No newline at end of file From 7d74b837a7329e963aaa58b5f683a243bc2e05bd Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 13:18:19 -0400 Subject: [PATCH 02/17] test with token for forked repo --- .github/workflows/create_shared_dependencies_release_tag.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index f084bc843f..4b47fcdba3 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -17,13 +17,14 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.releaseTag }} + token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Git run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - - name: Set up JDK 1.8 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 From 0a03fff1275b19bfaf80555bed58eaebec69651d Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 13:22:59 -0400 Subject: [PATCH 03/17] forked repo --- .github/workflows/create_shared_dependencies_release_tag.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index 4b47fcdba3..a1ba9c44c3 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -16,6 +16,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: + repository: googleapis/sdk-platform-java ref: ${{ github.event.inputs.releaseTag }} token: ${{ secrets.GITHUB_TOKEN }} From 4d3ba1a5d0c0bfc534cf2e6b48e4b9ec9d2d378a Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 13:24:39 -0400 Subject: [PATCH 04/17] add distribution --- .github/workflows/create_shared_dependencies_release_tag.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index a1ba9c44c3..da81c83dab 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -29,6 +29,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: 17 + distribution: temurin - name: Create additional tag run: | From d7acaa00220704d3752b332e07f1d50f4622641c Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 13:36:20 -0400 Subject: [PATCH 05/17] update pom path --- .github/workflows/create_shared_dependencies_release_tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index da81c83dab..d64da79c69 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -33,6 +33,6 @@ jobs: - name: Create additional tag run: | - VERSION=$(mvn -f java-shared-dependencies/first-party-dependencies/pom.xml help:evaluate -Dexpression=project.dependencies.dependency[0].version -q -DforceStdout) + VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f java-shared-dependencies/first-party-dependencies/pom.xml) git tag google-cloud-shared-dependencies/v$VERSION ${{ github.event.inputs.releaseTag }} git push origin google-cloud-shared-dependencies/v$VERSION \ No newline at end of file From cc130865e821e8dcad804508231b131d36c2366f Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 13:50:48 -0400 Subject: [PATCH 06/17] edit permissions --- .github/workflows/create_shared_dependencies_release_tag.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index d64da79c69..c5b6e9ad54 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -12,13 +12,14 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: write-all steps: - name: Checkout code uses: actions/checkout@v3 with: repository: googleapis/sdk-platform-java ref: ${{ github.event.inputs.releaseTag }} - token: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ github.token }} - name: Set up Git run: | From 66b009b162e261658296485641e1b20807759ddf Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:24:51 -0400 Subject: [PATCH 07/17] update workflow to use versions.txt file instead of pom.xml --- .github/workflows/create_shared_dependencies_release_tag.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index c5b6e9ad54..1e9ad8b165 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -34,6 +34,7 @@ jobs: - name: Create additional tag run: | - VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f java-shared-dependencies/first-party-dependencies/pom.xml) + ARTIFACT_ID='google-cloud-shared-dependencies' + VERSION=$(grep "${ARTIFACT_ID}" versions.txt | cut -d':' -f2) git tag google-cloud-shared-dependencies/v$VERSION ${{ github.event.inputs.releaseTag }} git push origin google-cloud-shared-dependencies/v$VERSION \ No newline at end of file From 872abec036d6a0b54aad900da29542c1af0f141f Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:27:53 -0400 Subject: [PATCH 08/17] test workflow on forked repo only --- .../workflows/create_shared_dependencies_release_tag.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index 1e9ad8b165..eb0a0fbadc 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -14,13 +14,6 @@ jobs: runs-on: ubuntu-latest permissions: write-all steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - repository: googleapis/sdk-platform-java - ref: ${{ github.event.inputs.releaseTag }} - GH_TOKEN: ${{ github.token }} - - name: Set up Git run: | git config --local user.email "action@github.com" From e927544328960440bde7bfb0ce6184b30203a986 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:28:36 -0400 Subject: [PATCH 09/17] remove release tag needed for fork only --- .../workflows/create_shared_dependencies_release_tag.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index eb0a0fbadc..3036d1077f 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -4,10 +4,10 @@ on: release: types: [published] workflow_dispatch: # If manually triggered, clarify which release to create the additional tag for - inputs: - releaseTag: - description: 'Release Tag' - required: true +# inputs: +# releaseTag: +# description: 'Release Tag' +# required: true jobs: build: From ea0843bfc3afc3ef916240bd28dab7f663331c5e Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:34:03 -0400 Subject: [PATCH 10/17] parsing versions.txt means we don't need maven, so removing java setup --- .../workflows/create_shared_dependencies_release_tag.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index 3036d1077f..7526051917 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -19,12 +19,6 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - - name: Create additional tag run: | ARTIFACT_ID='google-cloud-shared-dependencies' From ebb71321cfcf4316decbbdd6bb975726ce5477ae Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:37:24 -0400 Subject: [PATCH 11/17] fix workflow --- .../workflows/create_shared_dependencies_release_tag.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index 7526051917..55e60425cb 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -14,6 +14,12 @@ jobs: runs-on: ubuntu-latest permissions: write-all steps: + - name: Checkout code + uses: actions/checkout@v3 + with: +# ref: ${{ github.event.inputs.releaseTag }} + token: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Git run: | git config --local user.email "action@github.com" From a831b65a11a91f28f3bb71448d53b670b8752c4d Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:40:32 -0400 Subject: [PATCH 12/17] add back in manual input --- .../create_shared_dependencies_release_tag.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index 55e60425cb..ba9b89233a 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -4,10 +4,10 @@ on: release: types: [published] workflow_dispatch: # If manually triggered, clarify which release to create the additional tag for -# inputs: -# releaseTag: -# description: 'Release Tag' -# required: true + inputs: + releaseTag: + description: 'Release Tag' + required: true jobs: build: @@ -17,7 +17,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: -# ref: ${{ github.event.inputs.releaseTag }} + ref: ${{ github.event.inputs.releaseTag }} token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Git From 0ba2df54179dd113a67b414c24c4cc1ba49ddd90 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 14:49:26 -0400 Subject: [PATCH 13/17] update name of workflow --- .github/workflows/create_shared_dependencies_release_tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index ba9b89233a..4fa21b61ca 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -1,4 +1,4 @@ -name: Create additional tag for each release with first_party_dependencies version +name: Create additional tag for each release with google-cloud-shared-dependencies version on: release: From 0eb4257901d01b01f1022dec038594202b3bfcd2 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 16:12:28 -0400 Subject: [PATCH 14/17] update to create multiple tags --- .../create_shared_dependencies_release_tag.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_shared_dependencies_release_tag.yaml index 4fa21b61ca..515be511c5 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_shared_dependencies_release_tag.yaml @@ -25,9 +25,12 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - - name: Create additional tag + - name: Create additional tags run: | - ARTIFACT_ID='google-cloud-shared-dependencies' - VERSION=$(grep "${ARTIFACT_ID}" versions.txt | cut -d':' -f2) - git tag google-cloud-shared-dependencies/v$VERSION ${{ github.event.inputs.releaseTag }} - git push origin google-cloud-shared-dependencies/v$VERSION \ No newline at end of file + ARTIFACT_IDS=('google-cloud-shared-dependencies' 'api-common' 'gax') + for ARTIFACT_ID in "${ARTIFACT_IDS[@]}" + do + VERSION=$(grep "${ARTIFACT_ID}" versions.txt | cut -d':' -f2) + git tag ${ARTIFACT_ID}/$VERSION ${{ github.event.inputs.releaseTag }} + git push origin ${ARTIFACT_ID}/$VERSION + done \ No newline at end of file From 410e94199fcd5ece4e55d3f4c431f57c681c7e4a Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 16:13:44 -0400 Subject: [PATCH 15/17] update name of workflow --- ...cies_release_tag.yaml => create_additional_release_tag.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{create_shared_dependencies_release_tag.yaml => create_additional_release_tag.yaml} (91%) diff --git a/.github/workflows/create_shared_dependencies_release_tag.yaml b/.github/workflows/create_additional_release_tag.yaml similarity index 91% rename from .github/workflows/create_shared_dependencies_release_tag.yaml rename to .github/workflows/create_additional_release_tag.yaml index 515be511c5..1ee17068c8 100644 --- a/.github/workflows/create_shared_dependencies_release_tag.yaml +++ b/.github/workflows/create_additional_release_tag.yaml @@ -1,4 +1,4 @@ -name: Create additional tag for each release with google-cloud-shared-dependencies version +name: Create additional tags for each release on: release: From 0404653e10aede223265d008fa683cd02e6d46b0 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 16:14:19 -0400 Subject: [PATCH 16/17] add newline --- .github/workflows/create_additional_release_tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_additional_release_tag.yaml b/.github/workflows/create_additional_release_tag.yaml index 1ee17068c8..06885a4eb8 100644 --- a/.github/workflows/create_additional_release_tag.yaml +++ b/.github/workflows/create_additional_release_tag.yaml @@ -33,4 +33,4 @@ jobs: VERSION=$(grep "${ARTIFACT_ID}" versions.txt | cut -d':' -f2) git tag ${ARTIFACT_ID}/$VERSION ${{ github.event.inputs.releaseTag }} git push origin ${ARTIFACT_ID}/$VERSION - done \ No newline at end of file + done From 674e5372d360b461192fe7d314c3e17e2065e597 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Mon, 22 May 2023 16:14:49 -0400 Subject: [PATCH 17/17] fix typo --- .github/workflows/create_additional_release_tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_additional_release_tag.yaml b/.github/workflows/create_additional_release_tag.yaml index 06885a4eb8..4270461be5 100644 --- a/.github/workflows/create_additional_release_tag.yaml +++ b/.github/workflows/create_additional_release_tag.yaml @@ -3,7 +3,7 @@ name: Create additional tags for each release on: release: types: [published] - workflow_dispatch: # If manually triggered, clarify which release to create the additional tag for + workflow_dispatch: # If manually triggered, clarify which release to create the additional tags for inputs: releaseTag: description: 'Release Tag'