Skip to content

Commit

Permalink
Update Node.js GitHub action to use npm lockfile, switch to latest Ja…
Browse files Browse the repository at this point in the history
…eger UI (#6074)
  • Loading branch information
andreasgerstmayr authored Oct 15, 2024
1 parent ac6f78b commit 77939d4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/actions/setup-node.js/action.yml
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
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
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
4 changes: 2 additions & 2 deletions scripts/rebuild-ui.sh
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

0 comments on commit 77939d4

Please sign in to comment.