diff --git a/.github/workflows/release-package.yaml b/.github/workflows/release-package.yaml deleted file mode 100644 index 5358e89..0000000 --- a/.github/workflows/release-package.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Node.js Package - -on: - release: - types: [created] - -jobs: - publish-gpr: - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - defaults: - run: - working-directory: ./cli - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: 18 - registry-url: 'https://registry.npmjs.org' - - - run: | - npm ci - npm run test - npm run webpack - npm publish --access public - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..1258232 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,86 @@ +name: Release CLI and Extension + +on: + workflow_dispatch: + + release: + types: [created] + +jobs: + cli: + name: Release CLI + + runs-on: ubuntu-latest + + permissions: + packages: write + contents: read + + defaults: + run: + working-directory: ./cli + + strategy: + matrix: + node-version: [20.x] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + + - name: Publish CLI + run: | + npm ci + npm run test + npm run webpack + npm publish --access public + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + + extension: + name: Release Extension + + runs-on: ubuntu-latest + + permissions: + packages: write + contents: read + + defaults: + run: + working-directory: ./vs + + strategy: + matrix: + node-version: [20.x] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + + - name: Install NPM Dependencies + run: | + npm install + npm install -g vsce ovsx + + - name: Publish to Open VSX + run: npx ovsx publish -p $OPENVSX_TOKEN + env: + OPENVSX_TOKEN: ${{ secrets.OPENVSX_TOKEN }} + + - name: Publish to Marketplace + run: vsce publish -p $PUBLISHER_TOKEN + env: + PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/webpack.yaml b/.github/workflows/webpack.yaml new file mode 100644 index 0000000..5eed205 --- /dev/null +++ b/.github/workflows/webpack.yaml @@ -0,0 +1,55 @@ +name: NodeJS with Webpack + +on: + workflow_dispatch: + + push: + branches: ["main"] + paths: + - 'vs/**' + + pull_request: + branches: ["main"] + paths: + - 'vs/**' + +jobs: + build: + name: Build and Package + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [18.x] + + defaults: + run: + working-directory: ./vs + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://registry.npmjs.org' + + - name: Install NPM Dependencies + run: | + npm install + npm install -g vsce + + - name: Build and Package + run: | + npm run webpack + vsce package + + - name: Upload VSIX + uses: actions/upload-artifact@v4 + with: + name: VSIX + path: ./vs/*.vsix + if-no-files-found: error diff --git a/cli/package-lock.json b/cli/package-lock.json index 537d616..3b3bd98 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ibm/sourceorbit", - "version": "0.11.1", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ibm/sourceorbit", - "version": "0.11.1", + "version": "1.0.0", "license": "Apache 2", "dependencies": { "crc-32": "https://cdn.sheetjs.com/crc-32-latest/crc-32-latest.tgz" diff --git a/cli/package.json b/cli/package.json index b18f8c9..87e1bc0 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ibm/sourceorbit", - "version": "0.11.2", + "version": "1.0.0", "description": "IBM i dependency management tool", "bin": { "so": "./dist/index.js" diff --git a/vs/client/package-lock.json b/vs/client/package-lock.json index 6590a9e..cdace08 100644 --- a/vs/client/package-lock.json +++ b/vs/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-sourceorbit-client", - "version": "0.0.1", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vscode-sourceorbit-client", - "version": "0.0.1", + "version": "1.0.0", "license": "MIT", "dependencies": { "vscode-languageclient": "^8.1.0" @@ -24,7 +24,7 @@ }, "../../cli": { "name": "@ibm/sourceorbit", - "version": "0.11.1", + "version": "1.0.0", "dev": true, "license": "Apache 2", "dependencies": { @@ -38,7 +38,7 @@ "merge-options": "^3.0.4", "ts-loader": "^9.4.4", "typescript": "^4.8.4", - "vitest": "^0.31.0", + "vitest": "^2.1.2", "vscode-clle": "github:IBM/vscode-clle", "vscode-db2i": "github:halcyon-tech/vscode-db2i", "vscode-displayfile": "github:halcyon-tech/vscode-displayfile", diff --git a/vs/client/package.json b/vs/client/package.json index 5147dd1..ecac91f 100644 --- a/vs/client/package.json +++ b/vs/client/package.json @@ -3,7 +3,7 @@ "description": "Client", "author": "IBM", "license": "MIT", - "version": "0.0.1", + "version": "1.0.0", "publisher": "vscode", "engines": { "vscode": "^1.75.0" diff --git a/vs/package-lock.json b/vs/package-lock.json index 509f61e..168ef7c 100644 --- a/vs/package-lock.json +++ b/vs/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-sourceorbit", - "version": "1.2.3", + "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-sourceorbit", - "version": "1.2.3", + "version": "1.0.0", "hasInstallScript": true, "license": "MIT", "devDependencies": { diff --git a/vs/package.json b/vs/package.json index 4a108e2..7a1733f 100644 --- a/vs/package.json +++ b/vs/package.json @@ -9,7 +9,7 @@ }, "publisher": "IBM", "license": "MIT", - "version": "1.2.3", + "version": "1.0.0", "repository": { "url": "https://github.com/IBM/sourceorbit" }, diff --git a/vs/server/package-lock.json b/vs/server/package-lock.json index 8f5e196..d75e5c0 100644 --- a/vs/server/package-lock.json +++ b/vs/server/package-lock.json @@ -24,7 +24,7 @@ }, "../../cli": { "name": "@ibm/sourceorbit", - "version": "0.11.1", + "version": "1.0.0", "license": "Apache 2", "dependencies": { "crc-32": "https://cdn.sheetjs.com/crc-32-latest/crc-32-latest.tgz" @@ -37,7 +37,7 @@ "merge-options": "^3.0.4", "ts-loader": "^9.4.4", "typescript": "^4.8.4", - "vitest": "^0.31.0", + "vitest": "^2.1.2", "vscode-clle": "github:IBM/vscode-clle", "vscode-db2i": "github:halcyon-tech/vscode-db2i", "vscode-displayfile": "github:halcyon-tech/vscode-displayfile",