Skip to content
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.

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

opensearch-dashboards-2/2.12.0 package update #13885

Merged
merged 4 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 22 additions & 11 deletions opensearch-dashboards-2.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: opensearch-dashboards-2
version: 2.11.1
epoch: 2
version: 2.12.0
epoch: 0
description: Open source visualization dashboards for OpenSearch
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -53,13 +53,24 @@ pipeline:
with:
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
tag: ${{package.version}}
expected-commit: 989d8f41f37cca3275bf3fedc5c2057a717d1d64
expected-commit: 9ec9a677af5f28e5450926ce07e9d6c3273717a7

- uses: patch
with:
patches: 0001-Backport-Bump-typescript-and-axios.patch

- runs: |
# Workaround for "OpenSearch Dashboards should not be run as root. Use --allow-root to continue."
# This change will add the --allow-root when running the build_ts_refs and register_git_hook scripts
sed -i 's/\("osd:bootstrap": "scripts\/use_node scripts\/build_ts_refs\)\( && scripts\/use_node scripts\/register_git_hook\)/\1 --allow-root\2 --allow-root/' package.json

- runs: |
# Create "resolutions" section of package.json
jq '.resolutions |= (if . then . else {} end)' package.json > temp.json && mv temp.json package.json
for override in '"**/hoek"="npm:@hapi/hoek@>=8.5.1"'; do
jq ".resolutions.${override}" package.json > temp.json && mv temp.json package.json
done

- runs: |
set -x

Expand Down Expand Up @@ -89,7 +100,7 @@ subpackages:
repository: https://github.com/opensearch-project/opensearch-build
tag: ${{package.version}}
destination: opensearch-build
expected-commit: dce080075c219010371c02e699e816dd4df7758f # will need to be manually updated when opensearch dashboard auto update happens
expected-commit: 7e150e42bd47e989af58d508e9d7668e45bc31e8 # will need to be manually updated when opensearch dashboard auto update happens
- runs: |
install -Dm755 opensearch-build/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh ${{targets.contextdir}}/usr/share/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh
install -Dm666 opensearch-build/config/opensearch_dashboards-2.x.yml ${{targets.contextdir}}/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml
Expand All @@ -108,18 +119,18 @@ subpackages:
tag: ${{package.version}}.0
destination: ./plugins/${{range.value}}
- runs: |
if [ ${{range.value}} = "ganttChartDashboards" ]
then
mv ./plugins/ganttChartDashboards/gantt-chart ./plugins/gantt-chart
rm -r ./plugins/ganttChartDashboards
mv ./plugins/gantt-chart ./plugins/ganttChartDashboards
fi

yarn osd bootstrap --allow-root
cd ./plugins/${{range.value}}

node /home/build/scripts/plugin_helpers build --allow-root --skip-archive

if [ ${{range.value}} = "reportsDashboards" ]
then
# Remove a test directory of the `resolver` package to prevent surfacing a false-positive.
# See https://github.com/browserify/resolve/issues/288
rm -r build/opensearch-dashboards/${{range.value}}/node_modules/resolve/test
fi

mkdir -p "${{targets.contextdir}}/usr/share/opensearch-dashboards/plugins"
cp -r build/opensearch-dashboards/${{range.value}} "${{targets.contextdir}}/usr/share/opensearch-dashboards/plugins/"

Expand Down
Loading
Loading