Skip to content

Commit

Permalink
Merge branch 'release-1.x' into proxy-url-release-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
krmodelski authored Dec 19, 2024
2 parents d02abae + 722b826 commit b7a2509
Show file tree
Hide file tree
Showing 18 changed files with 164 additions and 304 deletions.
102 changes: 56 additions & 46 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,61 @@
name: Release

on:
workflow_dispatch:
inputs:
releaseVersion:
type: string
required: true
description: The version of this release. Must be a semantic version of the form X.Y.Z.
dry_run:
type: boolean
required: true
default: false
description: Dry run, will not push branches or upload the artifacts.
skip_tag:
type: boolean
required: true
default: false
description: If true, don't tag this release, just push it.
workflow_dispatch:
inputs:
releaseVersion:
type: string
required: true
description: The version of this release. Must be a semantic version of the form X.Y.Z.
dry_run:
type: boolean
required: true
default: false
description: Dry run, will not push branches or upload the artifacts.
skip_tag:
type: boolean
required: true
default: false
description: If true, don't tag this release, just push it.
pre_release:
type: boolean
required: true
default: false
description: If true, mark this as a pre-release

jobs:
release:
runs-on: ubuntu-latest
environment: production
steps:
- name: Checkout Javascript
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: npm install
- name: Package
run: ./build-package.sh
- name: Upload pre-release
if: ${{ github.event.inputs.dry_run != 'true' }}
run: npm publish --tag next
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- name: Tag release
if: ${{ github.event.inputs.skip_tag != 'true' }}
run: |
git config --global user.name 'Github Bot'
git config --global user.email '<>'
git tag ${{ github.events.inputs.version }}
- name: Push tag
if: ${{ github.event.inputs.dry_run != 'true' }}
run: |
git push ${{ github.events.inputs.version }}
release:
runs-on: ubuntu-latest
environment: production
steps:
- name: Checkout Javascript
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: npm install
- name: Package
run: ./build-package.sh
- name: Upload release
if: ${{ github.event.inputs.dry_run != 'true' && github.event.inputs.pre_release != 'true' }}
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- name: Upload pre-release
if: ${{ github.event.inputs.dry_run != 'true' && github.event.inputs.pre_release == 'true' }}
run: npm publish --tag next
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- name: Tag release
if: ${{ github.event.inputs.skip_tag != 'true' }}
run: |
git config --global user.name 'Github Bot'
git config --global user.email '<>'
git tag ${{ github.events.inputs.version }}
- name: Push tag
if: ${{ github.event.inputs.dry_run != 'true' }}
run: |
git push ${{ github.events.inputs.version }}
7 changes: 0 additions & 7 deletions CHANGELOG.md

This file was deleted.

154 changes: 6 additions & 148 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kubernetes/client-node",
"version": "1.0.0-rc7",
"version": "1.0.0",
"description": "NodeJS client for kubernetes",
"type": "module",
"repository": {
Expand Down Expand Up @@ -37,7 +37,8 @@
"exclude": [
"src/gen/*/**.ts",
"src/index.ts",
"src/*_test.ts"
"src/*_test.ts",
"src/test"
],
"extension": [
".ts"
Expand Down Expand Up @@ -73,7 +74,6 @@
"stream-buffers": "^3.0.2",
"tar": "^7.0.0",
"tmp-promise": "^3.0.2",
"tslib": "^2.5.0",
"ws": "^8.18.0"
},
"devDependencies": {
Expand All @@ -85,13 +85,11 @@
"chai": "^5.1.2",
"chai-as-promised": "^8.0.0",
"husky": "^9.0.6",
"jasmine": "^5.0.0",
"mocha": "^11.0.1",
"mock-fs": "^5.2.0",
"nock": "^13.2.9",
"prettier": "^3.0.0",
"pretty-quick": "^4.0.0",
"source-map-support": "^0.5.9",
"ts-mockito": "^2.3.1",
"tslint": "^6.1.3",
"tsx": "^4.19.1",
Expand All @@ -114,7 +112,6 @@
"arrowParens": "always"
},
"overrides": {
"colors": "1.4.0",
"whatwg-url@<12.0.1": "12.0.1"
}
}
2 changes: 1 addition & 1 deletion src/attach_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import WebSocket from 'isomorphic-ws';
import { ReadableStreamBuffer, WritableStreamBuffer } from 'stream-buffers';
import { anyFunction, anything, capture, instance, mock, verify, when } from 'ts-mockito';

import { CallAwaiter, matchBuffer, ResizableWriteableStreamBuffer } from '../test';
import { CallAwaiter, matchBuffer, ResizableWriteableStreamBuffer } from './test';
import { Attach } from './attach.js';
import { KubeConfig } from './config.js';
import { TerminalSize } from './terminal-size-queue.js';
Expand Down
Loading

0 comments on commit b7a2509

Please sign in to comment.