Skip to content

Commit

Permalink
ci: Don't install Nix only to install git-filter-repo
Browse files Browse the repository at this point in the history
  • Loading branch information
akirak committed Nov 3, 2023
1 parent 88b35f7 commit 5131366
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/merge-upstream.yml
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

0 comments on commit 5131366

Please sign in to comment.