diff --git a/.github/workflows/bump-master-version.yaml b/.github/workflows/bump-master-version.yaml deleted file mode 100644 index c3e7f0f936..0000000000 --- a/.github/workflows/bump-master-version.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Bump Version on master -on: - pull_request: - types: - - closed - branches: - - master - workflow_dispatch: - -jobs: - release: - name: Release - runs-on: ubuntu-latest - if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }} - steps: - - name: Checkout Release from lens - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Install dependencies - run: | - yarn install --frozen-lockfile - - name: Bump version to first alpha of next minor version - id: bump - run: | - CURRENT_VERSION=$(cat lerna.json | jq .version --raw-output) - - if ! [[ "${CURRENT_VERSION}" =~ ^\d+\.\d+\.0$ ]]; then - echo "Not a minor release" - echo "status=skip" >> $GITHUB_OUTPUT - exit 0 - fi - - yarn bump-version preminor - - echo "status=create" >> $GITHUB_OUTPUT - - uses: peter-evans/create-pull-request@v4 - if: ${{ steps.bump.outputs.status == 'create' }} - with: - add-paths: lerna.json,packages/*/package.json - commit-message: Update package.json version to next preminor because of recent release - signoff: true - delete-branch: true - title: Update version to next preminor - labels: skip-changelog diff --git a/.github/workflows/daily-alpha.yml b/.github/workflows/daily-alpha.yml index b7d6254b60..9eee0d6dd0 100644 --- a/.github/workflows/daily-alpha.yml +++ b/.github/workflows/daily-alpha.yml @@ -29,7 +29,7 @@ jobs: - name: Bump version id: version run: | - node packages/bump-version-for-cron/dist/index.js --path lerna.json + node packages/bump-version-for-cron/dist/index.js --path packages/core/package.json - name: Check if branch already exists id: check-branch run: git ls-remote --exit-code --tags origin v${{ steps.version.outputs.VERSION }} diff --git a/.github/workflows/publish-release-npm.yml b/.github/workflows/publish-release-npm.yml index 5a9f401d1c..01ca775fbe 100644 --- a/.github/workflows/publish-release-npm.yml +++ b/.github/workflows/publish-release-npm.yml @@ -38,7 +38,7 @@ jobs: - name: Publish NPM packages run: | npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" - VERSION=$(cat lerna.json | jq '.version' --raw-output) + VERSION=$(cat packages/core/package.json | jq '.version' --raw-output) echo ${VERSION} DIST_TAG=$(node packages/semver/dist/index.js --prerelease 0 ${VERSION}) npx lerna \ diff --git a/packages/release-tool/src/index.ts b/packages/release-tool/src/index.ts index 3cb3a6b9f2..7d795acc38 100755 --- a/packages/release-tool/src/index.ts +++ b/packages/release-tool/src/index.ts @@ -158,7 +158,7 @@ async function createReleaseBranchAndCommit(prBase: string, version: SemVer, prB const prBranch = `release/v${version.format()}`; await pipeExecFile("git", ["checkout", "-b", prBranch]); - await pipeExecFile("git", ["add", "lerna.json", "packages/*/package.json"]); + await pipeExecFile("git", ["add", "packages/*/package.json"]); await pipeExecFile("git", ["commit", "-sm", `Release ${version.format()}`]); await pipeExecFile("git", ["push", "--set-upstream", "origin", prBranch]);