diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0cb6248..2023ed5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -45,15 +45,12 @@ jobs: git commit -m "Update manifest.json to version $VERSION" || echo "No changes to commit" git push origin main - # Switch back to the original branch ONLY if not 'main' - - name: Checkout original branch (if not main) + + - name: Ensure HEAD is at updated main commit run: | - if [ "${{ env.BRANCH_NAME }}" != "main" ]; then - git checkout "${{ env.BRANCH_NAME }}" - git pull origin "${{ env.BRANCH_NAME }}" - else - echo "Already on main branch; skipping checkout." - fi + git fetch origin + git checkout main + git reset --hard origin/main - name: npm build run: | diff --git a/manifest.json b/manifest.json index 598fa5e..55baf21 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "folder-notes", "name": "Folder notes", - "version": "1.8.7", + "version": "1.8.8", "minAppVersion": "0.15.0", "description": "Create notes within folders that can be accessed without collapsing the folder, similar to the functionality offered in Notion.", "author": "Lost Paul",