diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3b8dd898..fcd6a92b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,12 +52,12 @@ jobs: - name: Publish Dry-Run # dry-run is always performed - uses: TypeFox/gh-publish-npm@4e114cef5985f2ab293188d9412ff63292bba217 # v0.3.3 / dev + uses: TypeFox/gh-publish-npm@0c4ee5a844ccb61c4092fc439f7db21c4a2f0ddb # v0.4.0 with: dry-run: true - verbose: true npm-tag: 'next' + verbose: true npm-packages: | - packages/client packages/vscode-ws-jsonrpc + packages/client packages/wrapper-react diff --git a/.github/workflows/publish_oidc.yml b/.github/workflows/publish_oidc.yml index fc6bf936c..6f8865921 100644 --- a/.github/workflows/publish_oidc.yml +++ b/.github/workflows/publish_oidc.yml @@ -6,25 +6,13 @@ permissions: on: push: + branches: + - 'release' tags: - '*-*.*.*' - workflow_dispatch: - inputs: - dryRun: - description: 'Perform a dry run without publishing to npm' - required: true - default: true - type: boolean - npmTag: - description: 'Enforce a specific tag for version comparisons. If not provided, the default tag "latest" will be used.' - required: false - default: 'next' - type: string - verbose: - description: 'npm publish with verbose output' - required: true - default: false - type: boolean + paths: + - '.github/workflows/**/*' + - '**/package.json' jobs: publish_oidc: @@ -40,23 +28,16 @@ jobs: uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0 with: cache: false - github_token: ${{ secrets.GITHUB_TOKEN }} - name: Install shell: bash run: | npm ci - - name: Versions Report & Setup + - name: Versions Report shell: bash - env: - NPM_DRY_RUN: ${{ github.event.inputs.dryRun }} - NPM_TAG: ${{ github.event.inputs.npmTag }} - NPM_VERBOSE: ${{ github.event.inputs.verbose }} - # logs the ENV values and stores them back in GITHUB_ENV with proper defaults for the next step run: | npm run report:versions - ./.github/workflows/scripts/checkStatus.sh - name: Build shell: bash @@ -75,20 +56,18 @@ jobs: npm run test:ci:tags - name: Publish - # dry-run can only be set to false if executed manually via workflow_dispatch - # tagged run only performs a dry-run for now - uses: TypeFox/gh-publish-npm@4e114cef5985f2ab293188d9412ff63292bba217 # v0.3.3 / dev + uses: TypeFox/gh-publish-npm@0c4ee5a844ccb61c4092fc439f7db21c4a2f0ddb # v0.4.0 with: - dry-run: ${{ env.NPM_DRY_RUN }} - npm-tag: ${{ env.NPM_TAG }} - verbose: ${{ env.NPM_VERBOSE }} + dry-run: false + npm-tag: 'next' + verbose: true npm-packages: | - packages/client packages/vscode-ws-jsonrpc + packages/client packages/wrapper-react - name: Check npm logs - if: always() + if: success() || failure() shell: bash run: | ./.github/workflows/scripts/checkNpmLogs.sh diff --git a/packages/client/package.json b/packages/client/package.json index 79b1d4d27..25b86b02c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -9,7 +9,7 @@ "license": "MIT", "author": { "name": "TypeFox GmbH", - "url": "http://www.typefox.io" + "url": "https://www.typefox.io" }, "repository": { "type": "git", diff --git a/packages/examples/package.json b/packages/examples/package.json index d686b1c79..feca3de33 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -10,7 +10,7 @@ "license": "MIT", "author": { "name": "TypeFox GmbH", - "url": "http://www.typefox.io" + "url": "https://www.typefox.io" }, "repository": { "type": "git", diff --git a/packages/examples/resources/debugger/package.json b/packages/examples/resources/debugger/package.json index cb33489ba..e684d54e9 100644 --- a/packages/examples/resources/debugger/package.json +++ b/packages/examples/resources/debugger/package.json @@ -5,7 +5,7 @@ "license": "MIT", "author": { "name": "TypeFox GmbH", - "url": "http://www.typefox.io" + "url": "https://www.typefox.io" }, "type": "module", "main": "./dist/debugServer.js", diff --git a/packages/vscode-ws-jsonrpc/package.json b/packages/vscode-ws-jsonrpc/package.json index edef0b3d9..99c67291e 100644 --- a/packages/vscode-ws-jsonrpc/package.json +++ b/packages/vscode-ws-jsonrpc/package.json @@ -9,7 +9,7 @@ "license": "MIT", "author": { "name": "TypeFox GmbH", - "url": "http://www.typefox.io" + "url": "https://www.typefox.io" }, "repository": { "type": "git", diff --git a/packages/wrapper-react/package.json b/packages/wrapper-react/package.json index 0c1c7c796..2f0397174 100644 --- a/packages/wrapper-react/package.json +++ b/packages/wrapper-react/package.json @@ -9,16 +9,18 @@ "typescript" ], "homepage": "https://github.com/TypeFox/monaco-languageclient/blob/main/packages/wrapper-react/README.md", - "bugs": "https://github.com/TypeFox/monaco-languageclient/issues", + "bugs": { + "url": "https://github.com/TypeFox/monaco-languageclient/issues" + }, "license": "MIT", "author": { - "name": "TypeFox", + "name": "TypeFox GmbH", "url": "https://www.typefox.io" }, "repository": { "type": "git", "url": "git+https://github.com/TypeFox/monaco-languageclient.git", - "directory": "packages/monaco-editor-react" + "directory": "packages/wrapper-react" }, "files": [ "lib",