fixup! squash! Don't use the Nix flake

akirak · Nov 2, 2023 · 48599da · 48599da
1 parent 63fcd6c
commit 48599da
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -49,8 +49,7 @@ jobs:
 
     - name: Filter commits
       run: |
-        tmp="recipes-$(date +%s)"
-        git switch -c "$tmp" ${{ steps.upstream.outputs.ref }}
+        git switch -C upstream-recipes ${{ steps.upstream.outputs.ref }}
         nix run nixpkgs#git-filter-repo -- \
           --path recipes/ --refs "merge-base..HEAD" \
           --commit-callback '
@@ -72,8 +71,7 @@ jobs:
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5
       with:
-        # base: merge-base
+        base: akirak
         token: ${{ secrets.PAT_FOR_PR }}
         title: 'Merge the upstream recipe commits'
-        branch: upstream-recipes
         labels: automation