Skip to content

Commit

Permalink
squash! Don't use the Nix flake
Browse files Browse the repository at this point in the history
  • Loading branch information
akirak committed Nov 2, 2023
1 parent 4ee86a2 commit d33d911
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/merge-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ jobs:
git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
- name: Retrieve the merge base
id: merge-base
run: |
rev=$(git merge-base ${{ steps.upstream.outputs.ref }} ${{ steps.start.outputs.rev }})
echo "rev=$rev" >> "$GITHUB_OUTPUT"
git switch -C merge-base "$rev"
git push --force origin HEAD
- name: Filter commits
run: |
tmp="recipes-$(date +%s)"
git switch -c "$tmp" ${{ steps.upstream.outputs.ref }}
nix run nixpkgs#git-filter-repo -- \
--path recipes/ --refs "${{ steps.merge-base.outputs.rev }}..HEAD" \
--path recipes/ --refs "merge-base..HEAD" \
--commit-callback '
commit.committer_name = commit.author_name
commit.committer_email = commit.author_email
Expand All @@ -68,7 +68,7 @@ jobs:
- name: Create a pull request
uses: peter-evans/create-pull-request@v5
with:
base: ${{ steps.merge-base.outputs.rev }}
base: merge-base
token: ${{ secrets.PAT_FOR_PR }}
title: 'Merge the upstream recipe commits'
branch: create-pull-request/merge-recipes
Expand Down

0 comments on commit d33d911

Please sign in to comment.