diff --git a/.github/workflows/process-release.yml b/.github/workflows/process-release.yml index 1d25c16aec..4824cfbb77 100644 --- a/.github/workflows/process-release.yml +++ b/.github/workflows/process-release.yml @@ -17,7 +17,7 @@ jobs: id: setup uses: ./.github/actions/setup - - run: ./scripts/release/process-release.js + - run: yarn workspace scripts processRelease env: EVENT_NUMBER: ${{ github.event.issue.number }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index d7d49ba08e..dfa5057543 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "specs:fix": "eslint --ext=yml specs/ --fix", "specs:lint": "eslint --ext=yml specs/$0", "github-actions:lint": "eslint --ext=yml .github/", - "release": "yarn workspace scripts release" + "release": "yarn workspace scripts createReleaseIssue" }, "devDependencies": { "@openapitools/openapi-generator-cli": "2.4.26", diff --git a/scripts/package.json b/scripts/package.json index 46c9110d79..cf73e43f4c 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -3,13 +3,15 @@ "version": "1.0.0", "scripts": { "build": "tsc", - "release": "yarn build && node dist/scripts/release/create-release-issue.js", + "createReleaseIssue": "yarn build && node dist/scripts/release/create-release-issue.js", + "processRelease": "yarn build && node dist/scripts/release/process-release.js", "setHostsOptions": "yarn build && node dist/scripts/pre-gen/setHostsOptions.js" }, "devDependencies": { "@octokit/rest": "18.12.0", "@types/js-yaml": "4.0.5", "@types/node": "16.11.11", + "@types/semver": "7.3.9", "dotenv": "16.0.0", "execa": "5.1.1", "js-yaml": "4.1.0", diff --git a/scripts/release/create-release-issue.ts b/scripts/release/create-release-issue.ts index 1e316d72a2..9d99fbea4c 100755 --- a/scripts/release/create-release-issue.ts +++ b/scripts/release/create-release-issue.ts @@ -13,7 +13,7 @@ dotenv.config(); type Version = { current: string; langName: string; - next?: string; + next?: string | null; noCommit?: boolean; skipRelease?: boolean; }; diff --git a/yarn.lock b/yarn.lock index 69fff3a224..30b6c76563 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1436,6 +1436,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:7.3.9": + version: 7.3.9 + resolution: "@types/semver@npm:7.3.9" + checksum: 60bfcfdfa7f937be2c6f4b37ddb6714fb0f27b05fe4cbdfdd596a97d35ed95d13ee410efdd88e72a66449d0384220bf20055ab7d6b5df10de4990fbd20e5cbe0 + languageName: node + linkType: hard + "@types/stack-utils@npm:^2.0.0": version: 2.0.1 resolution: "@types/stack-utils@npm:2.0.1" @@ -5885,6 +5892,7 @@ __metadata: "@octokit/rest": 18.12.0 "@types/js-yaml": 4.0.5 "@types/node": 16.11.11 + "@types/semver": 7.3.9 dotenv: 16.0.0 execa: 5.1.1 js-yaml: 4.1.0