Skip to content

Commit

Permalink
Merge pull request #3347 from openedx/merge-22-to-23
Browse files Browse the repository at this point in the history
chore: merge release config changes from v22 to v23
  • Loading branch information
brian-smith-tcril authored Dec 12, 2024
2 parents b82ef74 + 5ae0635 commit baa5161
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 41 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/lockfileversion-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ name: Lockfile Version check
on:
push:
branches:
- master
- next
- release-*
pull_request:

jobs:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Release CI

on:
workflow_dispatch:
push:
branches:
- master
- alpha
- beta
- next
- release-*
jobs:
release:
name: Release
Expand Down Expand Up @@ -38,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
30 changes: 0 additions & 30 deletions .github/workflows/sync-master-alpha.yml

This file was deleted.

7 changes: 3 additions & 4 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"branches": [
"master",
"next",
{ "name": "alpha", "prerelease": true },
{ "name": "beta", "prerelease": true }
{ "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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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",
Expand Down

0 comments on commit baa5161

Please sign in to comment.