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

Simply use deb to install git-filter-repo #11

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Simply use deb to install git-filter-repo #11

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
10 changes: 5 additions & 5 deletions .github/workflows/merge-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ jobs:
run: |
echo "rev=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"

- name: Install git-filter-repo
run: |
sudo apt-get update && sudo apt-get install git-filter-repo --yes

- name: Fetch the upstream
run: |
git remote add upstream ${{ matrix.upstream }}
git fetch upstream ${{ matrix.upstream_branch }}

- uses: DeterminateSystems/nix-installer-action@v4
with:
diagnostic-endpoint: ''

- name: Configure the Git identity
run: |
# Set some identity. Actually it will be overridden later by git-filter-repo,
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Filter commits
run: |
git switch -C upstream-recipes upstream/${{ matrix.upstream_branch }}
nix run nixpkgs#git-filter-repo -- \
git-filter-repo \
--path recipes/ --refs "${{ steps.merge-base.outputs.rev }}..HEAD" \
--commit-callback '
commit.committer_name = commit.author_name
Expand Down