fix(pr): make prs only pull changes from pr branch instead of head merge (#9937)

This commit is contained in:
RyanHolstien 2024-02-27 14:22:40 -06:00 committed by GitHub
parent ddf0b7d2cd
commit aa5ba5bc23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 40 additions and 40 deletions

View File

@ -59,7 +59,7 @@ jobs:
distribution: "zulu" distribution: "zulu"
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}

View File

@ -35,7 +35,7 @@ jobs:
elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }} elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: ./.github/actions/ci-optimization - uses: ./.github/actions/ci-optimization
id: ci-optimize id: ci-optimize
@ -61,7 +61,7 @@ jobs:
with: with:
timezoneLinux: ${{ matrix.timezone }} timezoneLinux: ${{ matrix.timezone }}
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
@ -105,7 +105,7 @@ jobs:
if: ${{ needs.setup.outputs.docker_change == 'true' }} if: ${{ needs.setup.outputs.docker_change == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: "3.10" python-version: "3.10"

View File

@ -27,7 +27,7 @@ jobs:
command: ["datahub-client", "datahub-protobuf", "spark-lineage"] command: ["datahub-client", "datahub-protobuf", "spark-lineage"]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: hsheth2/sane-checkout-action@v1 - uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:

View File

@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: "3.10" python-version: "3.10"

View File

@ -25,7 +25,7 @@ jobs:
python_release_version: ${{ steps.python_release_version.outputs.release_version }} python_release_version: ${{ steps.python_release_version.outputs.release_version }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Compute Tag - name: Compute Tag
id: tag id: tag
run: | run: |
@ -50,7 +50,7 @@ jobs:
if: ${{ needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Build and push - name: Build and push
uses: ./.github/actions/docker-custom-build-and-push uses: ./.github/actions/docker-custom-build-and-push
with: with:

View File

@ -27,7 +27,7 @@ jobs:
publish: ${{ steps.publish.outputs.publish }} publish: ${{ steps.publish.outputs.publish }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Compute Tag - name: Compute Tag
id: tag id: tag
run: | run: |
@ -46,7 +46,7 @@ jobs:
needs: setup needs: setup
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Build and push - name: Build and push
uses: ./.github/actions/docker-custom-build-and-push uses: ./.github/actions/docker-custom-build-and-push
with: with:

View File

@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: "3.10" python-version: "3.10"
@ -82,7 +82,7 @@ jobs:
elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }} elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Compute Tag - name: Compute Tag
id: tag id: tag
run: | run: |
@ -148,7 +148,7 @@ jobs:
if: ${{ needs.setup.outputs.backend_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.backend_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Checkout # adding checkout step just to make trivy upload happy - name: Checkout # adding checkout step just to make trivy upload happy
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Download image - name: Download image
uses: ishworkh/docker-image-artifact-download@v1 uses: ishworkh/docker-image-artifact-download@v1
if: ${{ needs.setup.outputs.publish != 'true' }} if: ${{ needs.setup.outputs.publish != 'true' }}
@ -212,7 +212,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps: steps:
- name: Checkout # adding checkout step just to make trivy upload happy - name: Checkout # adding checkout step just to make trivy upload happy
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Download image - name: Download image
uses: ishworkh/docker-image-artifact-download@v1 uses: ishworkh/docker-image-artifact-download@v1
if: ${{ needs.setup.outputs.publish != 'true' }} if: ${{ needs.setup.outputs.publish != 'true' }}
@ -248,7 +248,7 @@ jobs:
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Pre-build artifacts for docker image - name: Pre-build artifacts for docker image
run: | run: |
./gradlew :metadata-jobs:mce-consumer-job:build -x test --parallel ./gradlew :metadata-jobs:mce-consumer-job:build -x test --parallel
@ -276,7 +276,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps: steps:
- name: Checkout # adding checkout step just to make trivy upload happy - name: Checkout # adding checkout step just to make trivy upload happy
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Download image - name: Download image
uses: ishworkh/docker-image-artifact-download@v1 uses: ishworkh/docker-image-artifact-download@v1
if: ${{ needs.setup.outputs.publish != 'true' }} if: ${{ needs.setup.outputs.publish != 'true' }}
@ -312,7 +312,7 @@ jobs:
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Pre-build artifacts for docker image - name: Pre-build artifacts for docker image
run: | run: |
./gradlew :datahub-upgrade:build -x test --parallel ./gradlew :datahub-upgrade:build -x test --parallel
@ -340,7 +340,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps: steps:
- name: Checkout # adding checkout step just to make trivy upload happy - name: Checkout # adding checkout step just to make trivy upload happy
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Download image - name: Download image
uses: ishworkh/docker-image-artifact-download@v1 uses: ishworkh/docker-image-artifact-download@v1
if: ${{ needs.setup.outputs.publish != 'true' }} if: ${{ needs.setup.outputs.publish != 'true' }}
@ -376,7 +376,7 @@ jobs:
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Pre-build artifacts for docker image - name: Pre-build artifacts for docker image
run: | run: |
./gradlew :datahub-frontend:dist -x test -x yarnTest -x yarnLint --parallel ./gradlew :datahub-frontend:dist -x test -x yarnTest -x yarnLint --parallel
@ -436,7 +436,7 @@ jobs:
if: ${{ needs.setup.outputs.kafka_setup_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.kafka_setup_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Build and push - name: Build and push
uses: ./.github/actions/docker-custom-build-and-push uses: ./.github/actions/docker-custom-build-and-push
with: with:
@ -457,7 +457,7 @@ jobs:
if: ${{ needs.setup.outputs.mysql_setup_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.mysql_setup_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Build and push - name: Build and push
uses: ./.github/actions/docker-custom-build-and-push uses: ./.github/actions/docker-custom-build-and-push
with: with:
@ -478,7 +478,7 @@ jobs:
if: ${{ needs.setup.outputs.elasticsearch_setup_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.elasticsearch_setup_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- name: Build and push - name: Build and push
uses: ./.github/actions/docker-custom-build-and-push uses: ./.github/actions/docker-custom-build-and-push
with: with:
@ -501,7 +501,7 @@ jobs:
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: filter id: filter
with: with:
@ -534,7 +534,7 @@ jobs:
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: filter id: filter
with: with:
@ -575,7 +575,7 @@ jobs:
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: filter id: filter
with: with:
@ -624,7 +624,7 @@ jobs:
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: filter id: filter
with: with:
@ -674,7 +674,7 @@ jobs:
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Checkout # adding checkout step just to make trivy upload happy - name: Checkout # adding checkout step just to make trivy upload happy
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Download image Slim Image - name: Download image Slim Image
uses: ishworkh/docker-image-artifact-download@v1 uses: ishworkh/docker-image-artifact-download@v1
if: ${{ needs.datahub_ingestion_slim_build.outputs.needs_artifact_download == 'true' }} if: ${{ needs.datahub_ingestion_slim_build.outputs.needs_artifact_download == 'true' }}
@ -713,7 +713,7 @@ jobs:
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: filter id: filter
with: with:
@ -762,7 +762,7 @@ jobs:
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }} if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' }}
steps: steps:
- name: Checkout # adding checkout step just to make trivy upload happy - name: Checkout # adding checkout step just to make trivy upload happy
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Download image Full Image - name: Download image Full Image
uses: ishworkh/docker-image-artifact-download@v1 uses: ishworkh/docker-image-artifact-download@v1
if: ${{ needs.datahub_ingestion_full_build.outputs.needs_artifact_download == 'true' }} if: ${{ needs.datahub_ingestion_full_build.outputs.needs_artifact_download == 'true' }}
@ -829,7 +829,7 @@ jobs:
- name: Disk Check - name: Disk Check
run: df -h . && docker images run: df -h . && docker images
- name: Check out the repo - name: Check out the repo
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:

View File

@ -26,7 +26,7 @@ jobs:
gh-pages: gh-pages:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:

View File

@ -10,7 +10,7 @@ jobs:
actionlint: actionlint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- uses: reviewdog/action-actionlint@v1 - uses: reviewdog/action-actionlint@v1
with: with:
reporter: github-pr-review reporter: github-pr-review

View File

@ -50,7 +50,7 @@ jobs:
distribution: "zulu" distribution: "zulu"
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}

View File

@ -39,7 +39,7 @@ jobs:
elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }} elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: hsheth2/sane-checkout-action@v1 uses: acryldata/sane-checkout-action@v3
- uses: ./.github/actions/ci-optimization - uses: ./.github/actions/ci-optimization
id: ci-optimize id: ci-optimize
build: build:
@ -47,7 +47,7 @@ jobs:
timeout-minutes: 60 timeout-minutes: 60
needs: setup needs: setup
steps: steps:
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:

View File

@ -35,7 +35,7 @@ jobs:
distribution: "zulu" distribution: "zulu"
java-version: 17 java-version: 17
- uses: gradle/gradle-build-action@v2 - uses: gradle/gradle-build-action@v2
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: "3.10" python-version: "3.10"

View File

@ -36,7 +36,7 @@ jobs:
tag: ${{ steps.tag.outputs.tag }} tag: ${{ steps.tag.outputs.tag }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: acryldata/sane-checkout-action@v3
- name: Compute Tag - name: Compute Tag
id: tag id: tag
run: | run: |
@ -48,7 +48,7 @@ jobs:
needs: ["check-secret", "setup"] needs: ["check-secret", "setup"]
if: ${{ needs.check-secret.outputs.publish-enabled == 'true' }} if: ${{ needs.check-secret.outputs.publish-enabled == 'true' }}
steps: steps:
- uses: hsheth2/sane-checkout-action@v1 - uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:

View File

@ -14,7 +14,7 @@ jobs:
qodana: qodana:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: acryldata/sane-checkout-action@v3
- name: "Qodana Scan" - name: "Qodana Scan"
uses: JetBrains/qodana-action@v2022.3.4 uses: JetBrains/qodana-action@v2022.3.4
- uses: github/codeql-action/upload-sarif@v2 - uses: github/codeql-action/upload-sarif@v2

View File

@ -29,7 +29,7 @@ jobs:
spark-smoke-test: spark-smoke-test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: hsheth2/sane-checkout-action@v1 - uses: acryldata/sane-checkout-action@v3
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with: