update goldenfile checker for running in ent repo (#21617)

pull/21134/merge
John Maguire 3 months ago committed by GitHub
parent bc4c479a31
commit b88ddb8f9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -6,7 +6,7 @@ set -euo pipefail
# check if there is a diff in the xds testdata directory after running `make envoy-regen` # check if there is a diff in the xds testdata directory after running `make envoy-regen`
echo "regenerating xds files" echo "regenerating xds files"
make envoy-regen &>/dev/null make envoy-regen
echo "calculating changed files" echo "calculating changed files"
changed_xds_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/$GITHUB_BRANCH_REF")" | egrep "agent/xds/testdata/.*" || true) changed_xds_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/$GITHUB_BRANCH_REF")" | egrep "agent/xds/testdata/.*" || true)

@ -15,16 +15,29 @@ on:
- release/* - release/*
jobs: jobs:
get-go-version:
uses: ./.github/workflows/reusable-get-go-version.yml
# checks that there is no diff between the existing golden files # checks that there is no diff between the existing golden files
goldenfile-check: goldenfile-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs:
- get-go-version
steps: steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with: with:
ref: ${{ github.event.pull_request.head.sha }} ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0 # by default the checkout action doesn't checkout all branches fetch-depth: 0 # by default the checkout action doesn't checkout all branches
# NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
- name: Setup Git
if: ${{ endsWith(github.repository, '-enterprise') }}
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ${{ needs.get-go-version.outputs.go-version }}
- name: Download Modules
run: go mod download
- name: Check for golden file xds tests in diff - name: Check for golden file xds tests in diff
run: ./.github/scripts/goldenfile_checker.sh run: ./.github/scripts/goldenfile_checker.sh
env: env:
GITHUB_BRANCH_REF: ${{ github.event.pull_request.head.ref }} GITHUB_BRANCH_REF: ${{ github.event.pull_request.head.ref }}
CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}

Loading…
Cancel
Save