feat(actions/gapic): allow ability to ignore changes (#15)

googlemaps · Mar 30, 2020 · 11b1dca · 11b1dca
1 parent f1e60cc
commit 11b1dca
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/.github/workflows/test-actions.yml b/.github/workflows/test-actions.yml
@@ -12,9 +12,12 @@ jobs:
     - name: Run the gapic action
       uses: ./actions/gapic
       with:
-        target: //google/maps/routes/v1:gapic-maps-routes-v1-go
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        tar_path: gapic-maps-routes-v1-go/cloud.google.com/go/maps
-        tar_strip_components: 4
-        cache_service_account: ${{ secrets.SERVICE_ACCOUNT_CACHE }}
-        dry_run: true
+        target: //google/maps/routes/v1:google-maps-routes-v1-java-postprocess
+        github_token: ${{ secrets.GITHUB_TOKEN_REPO }}
+        tar_path: google-maps-routes-v1-java
+        tar_strip_components: 1
+        cache_service_account: ${{ secrets.CACHE_SERVICE_ACCOUNT }}
+        ignore: |
+          gradle/*
+          gradlew
+          gradlew.bat
diff --git a/actions/gapic/README.md b/actions/gapic/README.md
@@ -36,6 +36,10 @@ Service account json string for Bazel cache.
 
 Bucket name for Bazel cache.
 
+### `ignore`
+
+Files to keep out of staging.
+
 ### `dry_run`
 
 Run without writes to repo.
@@ -50,4 +54,8 @@ uses: googlemaps/actions/gapic@master
     tar_path: gapic-maps-routes-v1-go/cloud.google.com/go/maps
     tar_strip_components: 4
     cache_service_account: ${{ secrets.SERVICE_ACCOUNT_CACHE }}
+    ignore: |
+      gradle/*
+      gradlew
+      gradlew.bat
 ```
diff --git a/actions/gapic/action.yml b/actions/gapic/action.yml
@@ -30,6 +30,9 @@ inputs:
     description: "Bucket name for Bazel cache"
     required: false
     default: gapic_action_bazel_cache
+  ignore:
+    description: "Files to keep out of staging"
+    required: false
   dry_run:
     description: "Do not push changes"
     required: false

diff --git a/actions/gapic/entrypoint.sh b/actions/gapic/entrypoint.sh
@@ -51,15 +51,27 @@ tar xf "${TEMP_GIT_GOOGLEAPIS}/bazel-bin/${TARGET_OUTPUT}" --strip-components $I
 [[ -n $(git diff "origin/master") ]] && differs_from_master=1 || differs_from_master=0
 
 if [ $differs_from_master ]; then
+    set -x
+
     git add -A
+
+    if [[ -n "${INPUT_IGNORE}" ]]; then
+        for f in $INPUT_IGNORE; do
+            git reset HEAD "${f}"
+        done
+        git status
+    fi
+
     git commit -m 'feat: regenerate gapic' || true
 
+    echo "DEBUG: checking if branch already exists"
     [[ -n $(git ls-remote --heads origin ${BRANCH}) ]] && has_branch=1 || has_branch=0
 
-
-    if [[ ( !$has_branch || -n $(git diff "origin/${BRANCH}") ) && -z $INPUT_DRY_RUN ]]; then
+    echo "DEBUG: if branch exists, check if different"
+    if [[ ($has_branch -eq 0 || -n $(git diff "origin/${BRANCH}")) && -z $INPUT_DRY_RUN ]]; then
         git push -f -u origin $BRANCH
 
+        echo "DEBUG: creating pull request"
         curl \
             -H "Authorization: Bearer ${INPUT_GITHUB_TOKEN}" \
             -H "Content-Type:application/json" \