Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clone the PR's merge branch vs head in e2e tests #483

Merged
merged 1 commit into from
Jan 29, 2025
+12 −10
Merged

Clone the PR's merge branch vs head in e2e tests #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/e2e-nvidia-l4-x1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ jobs:
- name: Checkout instructlab/sdg
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: "instructlab/sdg"
path: "sdg"
# https://github.com/actions/checkout/issues/249
fetch-depth: 0
Expand All @@ -105,8 +104,10 @@ jobs:
if: ${{ github.event_name == 'pull_request_target' }}
working-directory: ./sdg
run: |
git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }}
git checkout pr-${{ github.event.pull_request.number }}
git fetch origin pull/${{ github.event.pull_request.number }}/merge:pr-merge-${{ github.event.pull_request.number }}
git checkout pr-merge-${{ github.event.pull_request.number }}
git log -1 --format="%H %s"


- name: Install ilab
working-directory: ./instructlab
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/e2e-nvidia-l40s-x4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
- name: Checkout instructlab/sdg
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: "instructlab/sdg"
path: "sdg"
# https://github.com/actions/checkout/issues/249
fetch-depth: 0
Expand Down Expand Up @@ -129,15 +128,17 @@ jobs:
if: steps.check_pr.outputs.is_pr == 'true'
working-directory: ./sdg
run: |
gh pr checkout ${{ steps.check_pr.outputs.pr_or_branch }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
git fetch origin pull/${{ steps.check_pr.outputs.pr_or_branch }}/merge:pr-merge-${{ steps.check_pr.outputs.pr_or_branch }}
git checkout pr-merge-${{ steps.check_pr.outputs.pr_or_branch }}
git log -1 --format="%H %s"

- name: Checkout branch
if: steps.check_pr.outputs.is_pr == 'false'
working-directory: ./sdg
run: |
git checkout ${{ steps.check_pr.outputs.pr_or_branch }}
git log -1 --format="%H %s"


- name: Install ilab
working-directory: ./instructlab
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-nvidia-t4-x1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ jobs:
- name: Checkout instructlab/sdg
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: "instructlab/sdg"
path: "sdg"
# https://github.com/actions/checkout/issues/249
fetch-depth: 0
Expand All @@ -105,8 +104,9 @@ jobs:
if: github.event_name == 'pull_request_target'
working-directory: ./sdg
run: |
git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }}
git checkout pr-${{ github.event.pull_request.number }}
git fetch origin pull/${{ github.event.pull_request.number }}/merge:pr-merge-${{ github.event.pull_request.number }}
git checkout pr-merge-${{ github.event.pull_request.number }}
git log -1 --format="%H %s"

- name: Install ilab
working-directory: ./instructlab
Expand Down
Loading