Creepso/Wplace-BlueMarble
1
0
Fork 0
mirror of https://github.com/SwingTheVine/Wplace-BlueMarble.git synced 2026-03-11 21:26:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed merge issue

Browse source
This commit is contained in:
SwingTheVine 2025-07-27 08:41:41 -04:00
parent 8104cd2883
commit 9db17bcfbf
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/build.yml vendored
View file

@ -125,15 +125,23 @@ jobs:
- name: Update Source Map URL
run: |
sed -i "s|sourceMappingURL=.*|sourceMappingURL=https://raw.githubusercontent.com/${{ github.repository }}/${AUTO_SHA}/dist/BlueMarble.user.js.map|" dist/BlueMarble.user.js
echo "Updated sourceMappingURL:"
grep 'sourceMappingURL=' dist/BlueMarble.user.js
- name: Commit New Source Map URL
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
git fetch origin
git checkout main || git checkout -b main
git merge --squash origin/auto
git add dist/BlueMarble.user.js
git commit -m "Merge version; ${{ needs.build.outputs.MSG }}" || echo "No changes to commit"
git push
- name: Merge Auto -> Main
run: |
git fetch origin
git checkout origin/main -B main
git merge --squash origin/auto
git commit -m "Release version; ${{ needs.build.outputs.MSG }}" || echo "No changes to commit"
git push origin main