diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 73f1911..9008749 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -19,7 +19,7 @@ jobs: name: Release runs-on: ubuntu-latest needs: test - if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/next' + if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 with: @@ -29,10 +29,6 @@ jobs: with: node-version: 20 - run: npm ci - - name: Sync next branch - run: sh sync.sh - env: - GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }} - run: npm run semantic-release env: GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }} diff --git a/.releaserc.cjs b/.releaserc.cjs index 12b208b..81a9fb7 100644 --- a/.releaserc.cjs +++ b/.releaserc.cjs @@ -18,5 +18,5 @@ module.exports = { "publishCmd": "./publish.sh ${nextRelease.version} ${nextRelease.type}" }], ], - branches: ["main", "next"], + branches: ["main"], }; diff --git a/sync.sh b/sync.sh deleted file mode 100644 index 09dafa1..0000000 --- a/sync.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# set identity -git config --global user.email "github-actions[bot]@users.noreply.github.com" -git config --global user.name "github-actions[bot]" - -git remote add token-authed-github https://${GITHUB_TOKEN}@github.com/adobe/aem-lib - -# go to target branch -git checkout next -# pull all changes from main -git merge --no-ff --no-commit main -# reset some files -git checkout HEAD package.json package-lock.json CHANGELOG.md -# commit changes -git commit -m "chore: sync with main" -# push changes -git push token-authed-github next -git checkout main