Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into ip-location-apis
Browse files Browse the repository at this point in the history
joegallo committed Dec 5, 2024
2 parents e1dea18 + 5485843 commit bfb0845
Showing 91 changed files with 2,134 additions and 941 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -233,5 +233,6 @@ dist/* binary
### Linguist Overrides #############################################################################

output/** linguist-generated=true
output/schema/validation-errors.json linguist-generated=false

####################################################################################################
2 changes: 1 addition & 1 deletion .github/workflows/update-rest-api-json.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: ['main', '8.x', '8.16', '7.17']
branch: ['main', '8.x', '8.16', '8.17', 7.17']

steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/validate-pr.yml
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ jobs:
else
branch=$GITHUB_REF_NAME
fi
node scripts/upload-recording/download.js --branch $branch
node scripts/upload-recording/download.js --branch $branch --git
node scripts/clone-elasticsearch/index.js --branch $branch
env:
GCS_CREDENTIALS: ${{ secrets.GCS_CREDENTIALS }}
Loading

0 comments on commit bfb0845

Please sign in to comment.