diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index d2e7fdb7136..327a1522ff1 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -39,8 +39,6 @@ jobs: run: corepack yarn version apply --all --json | jq -s > releases.json - name: Prepare changelog run: corepack yarn workspace @uppy-dev/release update-changelogs releases.json | xargs git add - - name: Update contributors table - run: corepack yarn contributors:save && corepack yarn remark -foq README.md && git add README.md - name: Update CDN URLs run: corepack yarn workspace @uppy-dev/release update-version-URLs | xargs git add - name: Stage changes and remove temp files diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a036624b6b5..049e00d3960 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Login to NPM run: corepack yarn config set npmAuthToken ${{ toJSON(secrets.NPM_TOKEN) }} - name: Publish to NPM - run: corepack yarn workspaces foreach --no-private npm publish --access public --tolerate-republish + run: corepack yarn workspaces foreach --no-private npm publish --access public --tag next --tolerate-republish - name: Merge PR id: merge run: | @@ -62,7 +62,7 @@ jobs: id: uppyVersion run: jq -r '"##[set-output name=version;]"+.version' < packages/uppy/package.json - name: Create GitHub release - run: gh release create uppy@${{ steps.uppyVersion.outputs.version }} -t "Uppy ${{ steps.uppyVersion.outputs.version }}" -F CHANGELOG.diff.md + run: gh release create uppy@${{ steps.uppyVersion.outputs.version }} -t "Uppy ${{ steps.uppyVersion.outputs.version }}" -F CHANGELOG.diff.md --prerelease env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload `uppy` to CDN diff --git a/private/release/choose-semverness.js b/private/release/choose-semverness.js index ac257b90f1e..3a7654c1f4d 100755 --- a/private/release/choose-semverness.js +++ b/private/release/choose-semverness.js @@ -81,7 +81,7 @@ export default async function pickSemverness ( { title: 'Minor', value: 'minor' }, { title: 'Major', value: 'major' }, ], - initial: 2, + initial: 0, }) if (!response.value) { @@ -141,7 +141,7 @@ export default async function pickSemverness ( { title: 'Minor', value: 'minor', disabled: robodogSemverness === 'major' }, { title: 'Major', value: 'major' }, ], - initial: 2, + initial: 0, }) releaseFile.write(` "@uppy/robodog": ${response.value}\n`) diff --git a/private/release/config.js b/private/release/config.js index 88ab626e50f..b6a6c7ec50c 100644 --- a/private/release/config.js +++ b/private/release/config.js @@ -1,3 +1,3 @@ export const REPO_OWNER = 'transloadit' export const REPO_NAME = 'uppy' -export const TARGET_BRANCH = 'main' +export const TARGET_BRANCH = '3.x'