diff --git a/.github/workflows/cd-insiders.yml b/.github/workflows/cd-pre.yml similarity index 95% rename from .github/workflows/cd-insiders.yml rename to .github/workflows/cd-pre.yml index 267da29..9bf5b16 100644 --- a/.github/workflows/cd-insiders.yml +++ b/.github/workflows/cd-pre.yml @@ -1,4 +1,4 @@ -name: Publish Insiders +name: Publish pre-release on: schedule: @@ -47,7 +47,7 @@ jobs: echo "::set-output name=status::changed" publish: - name: Publish insiders + name: Publish pre-release needs: check runs-on: ubuntu-latest if: needs.check.outputs.status == 'changed' @@ -60,8 +60,8 @@ jobs: node-version: '14' - name: Install run: yarn - - name: Apply insiders patch - run: yarn run patch-insiders + - name: Apply pre-release patch + run: yarn run patch-pre - name: Setup Environment run: node -e "console.log('PACKAGE_VERSION=' + require('./package.json').version + '\nPACKAGE_NAME=' + require('./package.json').name + '-' + require('./package.json').version)" >> $GITHUB_ENV - name: Package extension diff --git a/.vscodeignore b/.vscodeignore index b327db7..a86bb5b 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -35,7 +35,7 @@ BACKERS.md CODE_OF_CONDUCT.md CONTRIBUTING.md esbuild.js -README.insiders.md +README.pre.md svgo.config.js tsconfig*.json tsconfig*.tsbuildinfo diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c55e5da..715cf35 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -199,6 +199,6 @@ After the version commit and new tags are pushed to GitHub, the [Publish Stable If the action fails, the VSIX will need to be built locally with `yarn package` and uploaded manually in the marketplace. -### Insiders release +### Pre-release edition -The [Publish Insiders workflow](.github/workflows/cd-insiders.yml) is automatically run every AM unless no new changes have been committed to `main`. +The [Publish Pre-release workflow](.github/workflows/cd-pre.yml) is automatically run every AM unless no new changes have been committed to `main`. diff --git a/README.insiders.md b/README.pre.md similarity index 100% rename from README.insiders.md rename to README.pre.md diff --git a/package.json b/package.json index 62bda93..8c72747 100644 --- a/package.json +++ b/package.json @@ -3482,8 +3482,7 @@ "order": 70 }, "gitlens.insiders": { - "deprecationMessage": "Deprecated. Use the Insiders edition of GitLens instead", - "markdownDeprecationMessage": "Deprecated. Use the [Insiders edition](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens-insiders) of GitLens instead" + "deprecationMessage": "Deprecated. Use the pre-release edition of GitLens instead" } } } @@ -11637,10 +11636,11 @@ "lint": "eslint \"src/**/*.ts?(x)\" --fix", "lint:webviews": "eslint \"src/webviews/apps/**/*.ts?(x)\" --fix", "package": "vsce package --yarn", - "package-insiders": "yarn run patch-insiders && yarn run package", - "patch-insiders": "node ./scripts/applyPatchForInsiders.js", + "package-pre": "yarn run patch-pre && yarn run package --pre-release", + "patch-pre": "node ./scripts/applyPreReleasePatch.js", "pretty": "prettier --config .prettierrc --loglevel warn --write .", "pub": "vsce publish --yarn", + "pub-pre": "vsce publish --yarn --pre-release", "rebuild": "yarn run reset && yarn run build", "reset": "yarn run clean && yarn --frozen-lockfile", "test": "node ./out/test/runTest.js", diff --git a/scripts/applyPatchForInsiders.js b/scripts/applyPreReleasePatch.js similarity index 89% rename from scripts/applyPatchForInsiders.js rename to scripts/applyPreReleasePatch.js index a2875e1..c354363 100644 --- a/scripts/applyPatchForInsiders.js +++ b/scripts/applyPreReleasePatch.js @@ -2,7 +2,7 @@ const fs = require('fs'); // Patch README -const insert = fs.readFileSync('./README.insiders.md', { encoding: 'utf8' }); +const insert = fs.readFileSync('./README.pre.md', { encoding: 'utf8' }); const data = fs.readFileSync('./README.md', { encoding: 'utf8' }); fs.writeFileSync('./README.md', `${insert}\n${data}`);