Update rm.yml

moonshine-software · Dec 20, 2024 · c65a379 · c65a379
1 parent b208508
commit c65a379
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.github/workflows/rm.yml b/.github/workflows/rm.yml
@@ -24,10 +24,7 @@ jobs:
           git remote add subtree "$repo_url"
           git fetch subtree ${{ github.ref_name }}
       - run: |
-         git subtree pull --prefix src/${{ matrix.package.namespace }} subtree ${{ github.ref_name }} --squash || true
-      - run: |
-         repo_url="https://${{ secrets.SUPER_ACCESS_TOKEN }}@github.com/moonshine-software/${{ matrix.package.repo }}.git"
-         git subtree push --prefix src/${{ matrix.package.namespace }} "$repo_url" ${{ github.ref_name }}
+          git subtree pull --prefix src/${{ matrix.package.namespace }} subtree ${{ github.ref_name }} --squash --allow-unrelated-histories
       - run: |
           repo_url="https://${{ secrets.SUPER_ACCESS_TOKEN }}@github.com/moonshine-software/${{ matrix.package.repo }}.git"
           git subtree push --prefix src/${{ matrix.package.namespace }} "$repo_url" ${{ github.ref_name }}