diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 85ab538..d92b438 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -48,3 +48,25 @@ jobs: curl -sf -X POST \ -H "Authorization: Bearer ${{ secrets.WATCHTOWER_TOKEN }}" \ https://watchtower.goutailler-olivier.com/v1/update + + - name: Merge release to main + run: | + git config user.name "Gitea Actions" + git config user.email "actions@gitea" + git remote set-url origin https://${{ gitea.actor }}:${{ secrets.RELEASE_TOKEN }}@git.goutailler-olivier.com/${{ gitea.repository }}.git + git fetch origin main + git checkout main + git merge --no-ff ${{ gitea.ref_name }} -m "chore: release ${{ gitea.ref_name }}" + git push origin main + + - name: Bump version to next SNAPSHOT on develop + run: | + VERSION=$(echo "${{ gitea.ref_name }}" | sed 's/^v//') + IFS='.' read -r major minor patch <<< "$VERSION" + NEXT_VERSION="$major.$minor.$((patch + 1))-SNAPSHOT" + git fetch origin develop + git checkout develop + sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$NEXT_VERSION\"/" package.json + git add package.json + git commit -m "chore: bump version to $NEXT_VERSION" + git push origin develop diff --git a/src/app/menu/menu.html b/src/app/menu/menu.html index b8011e2..9b734d9 100644 --- a/src/app/menu/menu.html +++ b/src/app/menu/menu.html @@ -26,7 +26,6 @@