diff --git a/.github/workflows/lockfileversion-check.yml b/.github/workflows/lockfileversion-check.yml index 916dcb40d2..4a3c01197c 100644 --- a/.github/workflows/lockfileversion-check.yml +++ b/.github/workflows/lockfileversion-check.yml @@ -5,7 +5,8 @@ name: Lockfile Version check on: push: branches: - - master + - next + - release-* pull_request: jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1390787c0c..f77c38e3bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,8 @@ name: Release CI on: push: branches: - - master + - next + - release-* jobs: release: name: Release @@ -35,4 +36,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.OPENEDX_SEMANTIC_RELEASE_GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.OPENEDX_SEMANTIC_RELEASE_NPM_TOKEN }} - run: npx semantic-release@22 + run: npx semantic-release@22 --dry-run diff --git a/.github/workflows/sync-master-alpha.yml b/.github/workflows/sync-master-alpha.yml deleted file mode 100644 index 36d39e2ece..0000000000 --- a/.github/workflows/sync-master-alpha.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Sync alpha with master -on: - push: - branches: - - master - workflow_dispatch: - -jobs: - sync-branches: - runs-on: ubuntu-latest - name: Syncing branches - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Node - uses: actions/setup-node@v1 - with: - node-version: 18 - - name: Create Pull Request - id: cpr - uses: tretuna/sync-branches@1.4.0 - with: - GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} - FROM_BRANCH: master - TO_BRANCH: alpha - - name: Enable Pull Request Automerge - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} diff --git a/.releaserc b/.releaserc index 2c101b5028..94b6f78223 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,9 @@ { - "branches": ["master", "next"], + "branches": [ + { "name": "release-22.x", "range": "22.x", "channel": "22.x" }, + { "name": "release-23.x" }, + { "name": "next", "prerelease": true, "channel": "next" } + ], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", diff --git a/package.json b/package.json index 9be7168e6b..0289784d0f 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "stylelint": "stylelint \"src/**/*.scss\" \"scss/**/*.scss\" \"www/src/**/*.scss\" --config .stylelintrc.json", "lint": "npm run stylelint && eslint --ext .js --ext .jsx --ext .ts --ext .tsx . && npm run lint --workspaces --if-present", "prepublishOnly": "npm run build", - "semantic-release": "semantic-release", + "semantic-release": "semantic-release --dry-run", "snapshot": "jest --updateSnapshot", "start": "npm start --workspace=www", "test": "jest --coverage",