Skip to content

Commit b52c827

Browse files
authored
feat: switch to simpler version stamp method (#4479)
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent eae6f95 commit b52c827

File tree

101 files changed

+327
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+327
-223
lines changed

.github/workflows/release-please.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- candidate-*
66

77
pull_request:
8-
branches:
8+
branches:
99
- trunk
1010
- candidate-*
1111

@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- name: Initialize Release Please
2323
id: release
24-
if: ${{ github.event_name == 'push' }}
24+
if: ${{ github.event_name == 'push' }}
2525
uses: googleapis/release-please-action@v4
2626
with:
2727
target-branch: ${{ github.ref_name }}
@@ -41,11 +41,6 @@ jobs:
4141
registry-url: "https://registry.npmjs.org"
4242
scope: "@hpcc-js"
4343

44-
- name: Install OS Dependencies
45-
if: ${{ github.event_name == 'pull_request' || steps.release.outputs.release_created }}
46-
run: |
47-
pip install pandas scikit-learn
48-
4944
- name: Export GitHub Actions cache environment variables
5045
if: ${{ github.event_name == 'pull_request' || steps.release.outputs.release_created }}
5146
uses: actions/github-script@v7
@@ -67,7 +62,6 @@ jobs:
6762
- name: Build
6863
if: ${{ github.event_name == 'pull_request' || steps.release.outputs.release_created }}
6964
run: |
70-
npm run stamp-all
7165
npm run build
7266
npm run minimize
7367
npm run gen-legacy-types
@@ -109,15 +103,6 @@ jobs:
109103
# with:
110104
# github-token: ${{ secrets.GITHUB_TOKEN }}
111105

112-
- name: push stamped release
113-
if: ${{ steps.release.outputs.release_created }}
114-
run: |
115-
git config user.name github-actions[bot]
116-
git config user.email 4104672+github-actions[bot]@users.noreply.github.com
117-
git remote add gh-token "https://${{ secrets.GITHUB_TOKEN}}@github.com/yargs/yargs.git"
118-
git commit -a -m 'chore: stamp files for release'
119-
git push origin
120-
121106
- name: Publish
122107
if: ${{ steps.release.outputs.release_created }}
123108
env:

package-lock.json

Lines changed: 21 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hpcc-js",
3-
"version": "2.108.6",
3+
"version": "2.108.7",
44
"description": "HPCC Visualization Framework",
55
"private": true,
66
"jsdelivr": "dist/index.umd.min.js",
@@ -57,9 +57,6 @@
5757
"uninstall": "lerna clean && rimraf --glob packages/**/node_modules demos/**/node_modules apps/**/node_modules package-lock.json node_modules",
5858
"clean-root": "rimraf --glob build coverage dist lib* types temp tmp *.tsbuildinfo .vitepress/dist .vitepress/cache docs/api",
5959
"clean": "lerna run clean && npm run clean-root",
60-
"stamp": "lerna run stamp",
61-
"stamp-main": "node ./utils/bundle/src/stamp-main.js",
62-
"stamp-all": "run-s stamp stamp-main",
6360
"compile-es6": "lerna run --ignore \"@hpcc-js/test-*\" compile-es6",
6461
"compile-es6-watch": "lerna run --no-sort --stream --ignore \"@hpcc-js/test-*\" compile-es6-watch",
6562
"compile-umd": "lerna run --ignore \"@hpcc-js/test-*\" compile-umd",

packages/api/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"gen-legacy-types": "downlevel-dts ./types ./types-3.4",
3333
"build": "npm run compile-es6 && npm run bundle",
3434
"watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
35-
"stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
3635
"lint": "eslint ./src",
3736
"docs": "typedoc --options tdoptions.json .",
3837
"update": "npx --yes npm-check-updates -u -t minor"
@@ -59,4 +58,4 @@
5958
"url": "https://github.com/hpcc-systems/Visualization/issues"
6059
},
6160
"homepage": "https://github.com/hpcc-systems/Visualization"
62-
}
61+
}

packages/api/rollup.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22

3-
import { external, globals } from "@hpcc-js/bundle";
3+
import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
44
import alias from "@rollup/plugin-alias";
55
import commonjs from "@rollup/plugin-commonjs";
66
import sourcemaps from "rollup-plugin-sourcemaps";
@@ -26,6 +26,7 @@ export default {
2626
name: pkg.name
2727
}],
2828
plugins: [
29+
packageVersionPlugin(),
2930
alias({
3031
entries: [
3132
{ find: "d3-array", replacement: "@hpcc-js/common" },

packages/api/src/__package__.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export const PKG_NAME = "@hpcc-js/api";
2-
export const PKG_VERSION = "2.14.2";
3-
export const BUILD_VERSION = "2.108.6";
1+
export const PKG_NAME = "__PACKAGE_NAME__";
2+
export const PKG_VERSION = "__PACKAGE_VERSION__";
3+
export const BUILD_VERSION = "__BUILD_VERSION__";

packages/chart/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"gen-legacy-types": "downlevel-dts ./types ./types-3.4",
3333
"build": "npm run compile-es6 && npm run bundle",
3434
"watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
35-
"stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
3635
"lint": "eslint ./src",
3736
"docs": "typedoc --options tdoptions.json .",
3837
"update": "npx --yes npm-check-updates -u -t minor"
@@ -79,4 +78,4 @@
7978
"url": "https://github.com/hpcc-systems/Visualization/issues"
8079
},
8180
"homepage": "https://github.com/hpcc-systems/Visualization"
82-
}
81+
}

packages/chart/rollup.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { external, globals } from "@hpcc-js/bundle";
1+
import { external, globals, packageVersionPlugin } from "@hpcc-js/bundle";
2+
23
import alias from "@rollup/plugin-alias";
34
import commonjs from "@rollup/plugin-commonjs";
45
import sourcemaps from "rollup-plugin-sourcemaps";
@@ -24,6 +25,7 @@ export default {
2425
name: pkg.name
2526
}],
2627
plugins: [
28+
packageVersionPlugin(),
2729
alias({
2830
entries: [
2931
{ find: "d3-array", replacement: "@hpcc-js/common" },

packages/chart/src/__package__.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export const PKG_NAME = "@hpcc-js/chart";
2-
export const PKG_VERSION = "2.86.2";
3-
export const BUILD_VERSION = "2.108.6";
1+
export const PKG_NAME = "__PACKAGE_NAME__";
2+
export const PKG_VERSION = "__PACKAGE_VERSION__";
3+
export const BUILD_VERSION = "__BUILD_VERSION__";

packages/codemirror-shim/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"gen-legacy-types": "downlevel-dts ./types ./types-3.4",
3030
"build": "npm run compile-es6 && npm run bundle",
3131
"watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
32-
"stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
3332
"lint": "eslint ./src",
3433
"docs": "typedoc --options tdoptions.json .",
3534
"update": "npx --yes npm-check-updates -u -t minor"
@@ -49,4 +48,4 @@
4948
"url": "https://github.com/hpcc-systems/Visualization/issues"
5049
},
5150
"homepage": "https://github.com/hpcc-systems/Visualization"
52-
}
51+
}

0 commit comments

Comments
 (0)