Skip to content

Update Node.js GitHub action to use npm lockfile, switch to latest Jaeger UI #6074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 15, 2024
Merged

Update Node.js GitHub action to use npm lockfile, switch to latest Jaeger UI #6074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f10f3a
Update Node.js GitHub action to use npm lockfile, switch to latest Ja…
andreasgerstmayr Oct 10, 2024
9be31d9
adjust scripts/rebuild-ui.sh
andreasgerstmayr Oct 10, 2024
dab18f1
unshallow jaeger-ui submodule to receive tags
andreasgerstmayr Oct 11, 2024
4b4396e
Merge branch 'main' into switch-to-latest-jaegerui
yurishkuro Oct 12, 2024
0240429
update submodule, setup node.js version in CIT Hotrod workflow
andreasgerstmayr Oct 14, 2024
b3acf7b
Merge remote-tracking branch 'upstream/main' into switch-to-latest-ja…
andreasgerstmayr Oct 14, 2024
8c7aa64
Merge branch 'main' into switch-to-latest-jaegerui
yurishkuro Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/setup-node.js/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ runs:
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
with:
node-version: ${{ env.JAEGER_UI_NODE_JS_VERSION }}
cache: 'yarn'
cache-dependency-path: jaeger-ui/yarn.lock
cache: 'npm'
cache-dependency-path: jaeger-ui/package-lock.json
2 changes: 2 additions & 0 deletions .github/workflows/ci-docker-hotrod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
with:
go-version: 1.23.x

- uses: ./.github/actions/setup-node.js

- uses: ./.github/actions/setup-branch

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ We gratefully welcome improvements to documentation as well as to code.

### Pre-requisites
* Install [Go](https://golang.org/doc/install) and setup GOPATH and add $GOPATH/bin in PATH
* Install [Yarn](https://yarnpkg.com/) for running local build with the UI

This library uses Go modules to manage dependencies.

Expand Down
2 changes: 1 addition & 1 deletion jaeger-ui
Open in desktop
Submodule jaeger-ui updated 26 files
+9 −3 .github/workflows/Dockerfile
+1 −1 .github/workflows/codeql.yml
+6 −7 .github/workflows/lint-build.yml
+7 −7 .github/workflows/release.yml
+3 −3 .github/workflows/s390x-build.yaml
+1 −1 .github/workflows/scorecard.yml
+5 −5 .github/workflows/unit-tests.yml
+1 −1 .npmrc
+6 −10 BUILD.md
+3 −3 CONTRIBUTING.md
+12 −14 README.md
+22,092 −0 package-lock.json
+19 −22 package.json
+4 −5 packages/jaeger-ui/package.json
+1 −1 packages/jaeger-ui/src/components/App/TopNav.css
+8,183 −8,474 packages/jaeger-ui/src/components/Monitor/ServicesView/operationDetailsTable/__snapshots__/index.test.js.snap
+1 −1 packages/jaeger-ui/src/components/Monitor/ServicesView/operationDetailsTable/index.css
+1 −1 packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ResultItemTitle.tsx
+2 −2 packages/jaeger-ui/src/components/TracePage/index.tsx
+2 −2 packages/jaeger-ui/src/components/common/DetailsCard/__snapshots__/DetailList.test.js.snap
+5 −1 packages/jaeger-ui/src/types/index.tsx
+1 −1 packages/jaeger-ui/src/utils/tracking/README.md
+1 −1 packages/plexus/BUILD.md
+5 −5 packages/plexus/package.json
+7 −5 packages/plexus/src/DirectedGraph/builtins/Node.tsx
+0 −10,907 yarn.lock
4 changes: 2 additions & 2 deletions scripts/rebuild-ui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euxf -o pipefail

cd jaeger-ui

git fetch --all --tags
git fetch --all --unshallow --tags
git log --oneline --decorate=full -n 10 | cat

last_tag=$(git describe --tags --dirty 2>/dev/null)
Expand All @@ -32,4 +32,4 @@ if [[ "$last_tag" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
fi

# do a regular full build
yarn install --frozen-lockfile && cd packages/jaeger-ui && yarn build
npm ci && cd packages/jaeger-ui && npm run build
Loading