Skip to content

Commit

Permalink
Fixes rosetta/tests/extra-only-distribution.sh test failure (#276)
Browse files Browse the repository at this point in the history
Test failed due to cherry-picking from a future commit, which may
fail since the distribution was built on a pinned past commit.

The issue was even though the commit to cherry-pick only contained
a file deletion, because there were edits to the file between the
DISTRIBUTION_BASE_REF and TOT main, git cherry-pick errors out
because the file deleted was not the same as the one the patch was based
on

## Additionally
This PR will also allow nightly-distribution-test.yaml to be dispatched
thru the UI
  • Loading branch information
terrykong authored Oct 2, 2023
1 parent 48f541f commit a29cbff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/nightly-distribution-test.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Nightly Distribution test

on:
workflow_dispatch:
workflow_run:
workflows: [Nightly JAX build]
types: [completed]
Expand Down
1 change: 1 addition & 0 deletions rosetta/tests/extra-only-distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ DISTRIBUTION_BASE_REF=22117ce5a3606706ba9519ccdd77b532ad8ff7b2

git clone $UPSTREAM_URL $repo_tmp
git clone $UPSTREAM_URL $extra_tmp
git -C $extra_tmp checkout $DISTRIBUTION_BASE_REF
echo "patch/delete-readme" >> $patchlist_tmp

cd $extra_tmp
Expand Down

0 comments on commit a29cbff

Please sign in to comment.