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

adding hold and deploy steps to CI workflow #21

Merged
merged 5 commits into from
Nov 6, 2019
Merged
Show file tree
Hide file tree
Changes from 4 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
24 changes: 17 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
masterBranchOnly: &masterBranchOnly
filters:
branches:
only: "master"

version: 2.1
executors:
browser-executor:
Expand All @@ -15,7 +20,6 @@ jobs:
- run:
name: Install
command: npm ci && (cd .github/actions/sync-snippet-action && npm ci)

- save_cache:
paths:
- node_modules
Expand All @@ -27,6 +31,9 @@ jobs:
- run:
name: Test
command: npm test
- run:
name: Build
command: npm run build
- persist_to_workspace:
root: .
paths: .
Expand All @@ -46,9 +53,12 @@ workflows:
test-deploy:
jobs:
- build-browser-sdk
# - deploy-browser-sdk:
# requires:
# - build-browser-sdk
# filters:
# branches:
# only: "master"
- hold:
type: approval
requires:
- build-browser-sdk
<<: *masterBranchOnly
- deploy-browser-sdk:
requires:
- hold
<<: *masterBranchOnly

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: requiring hold which only runs on master should make this redundant

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call. Fixed

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import App from './App';
import FullStory from 'TBD/package-to-be-deployed';


FullStory.init('<your org id here>');
FullStory.init({ orgId: '<your org id here>' });

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a quick README fixup I'm sneaking in with the PR. It's not germane to the CI updates.

ReactDOM.render(<App />, document.getElementById('root'));
```
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"test": "npm run lint && npm run test:karma",
"test:karma": "karma start --single-run --browsers ChromeHeadless karma.conf.js",
"lint": "eslint src test .github/actions",
"build": "tsc src/index.d.ts && rollup -c",
"prepublishOnly": "npm run clean && npm run test && npm run build"
"build": "tsc src/index.d.ts && rollup -c"
},
"files": [
"dist",
Expand Down