Skip to content

Commit 8410785

Browse files
committed
Merge branch 'release/5.2.0'
2 parents 9bcbb9f + 2980c31 commit 8410785

3 files changed

Lines changed: 62 additions & 63 deletions

File tree

.circleci/config.yml

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -27,65 +27,64 @@ jobs:
2727
# To see the list of pre-built images that CircleCI provides for most common languages see
2828
# https://circleci.com/docs/2.0/circleci-images/
2929
docker:
30-
- image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
31-
command: /sbin/init
30+
- image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
3231
steps:
33-
# Machine Setup
34-
# If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
35-
# The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
36-
- checkout
37-
# Prepare for artifact and test results collection equivalent to how it was done on 1.0.
38-
# In many cases you can simplify this from what is generated here.
39-
# 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
40-
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
41-
# This is based on your 1.0 configuration file or project settings
42-
- run:
43-
working_directory: ~/awesomejerry/react-native-qrcode-svg
44-
command: nvm install 6.9.1 && nvm alias default 6.9.1
45-
# Dependencies
46-
# This would typically go in either a build or a build-and-test job when using workflows
47-
# Restore the dependency cache
48-
- restore_cache:
49-
keys:
50-
# This branch if available
51-
- v1-dep-{{ .Branch }}-
52-
# Default branch if not
53-
- v1-dep-master-
54-
# Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
55-
- v1-dep-
56-
# This is based on your 1.0 configuration file or project settings
57-
- run: npm install
58-
# Save dependency cache
59-
- save_cache:
60-
key: v1-dep-{{ .Branch }}-{{ epoch }}
61-
paths:
62-
# This is a broad list of cache paths to include many possible development environments
63-
# You can probably delete some of these entries
64-
- vendor/bundle
65-
- ~/virtualenvs
66-
- ~/.m2
67-
- ~/.ivy2
68-
- ~/.bundle
69-
- ~/.go_workspace
70-
- ~/.gradle
71-
- ~/.cache/bower
72-
- ./node_modules
73-
# Test
74-
# This would typically be a build job when using workflows, possibly combined with build
75-
# This is based on your 1.0 configuration file or project settings
76-
- run: npm run test
77-
# Deployment
78-
# Your existing circle.yml file contains deployment steps.
79-
# The config translation tool does not support translating deployment steps
80-
# since deployment in CircleCI 2.0 are better handled through workflows.
81-
# See the documentation for more information https://circleci.com/docs/2.0/workflows/
82-
# Teardown
83-
# If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
84-
# Save test results
85-
- store_test_results:
86-
path: /tmp/circleci-test-results
87-
# Save artifacts
88-
- store_artifacts:
89-
path: /tmp/circleci-artifacts
90-
- store_artifacts:
91-
path: /tmp/circleci-test-results
32+
# Machine Setup
33+
# If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
34+
# The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
35+
- checkout
36+
# Prepare for artifact and test results collection equivalent to how it was done on 1.0.
37+
# In many cases you can simplify this from what is generated here.
38+
# 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
39+
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
40+
# This is based on your 1.0 configuration file or project settings
41+
- run:
42+
working_directory: ~/awesomejerry/react-native-qrcode-svg
43+
command: nvm install 8.11.1 && nvm alias default 8.11.1
44+
# Dependencies
45+
# This would typically go in either a build or a build-and-test job when using workflows
46+
# Restore the dependency cache
47+
- restore_cache:
48+
keys:
49+
# This branch if available
50+
- v1-dep-{{ .Branch }}-
51+
# Default branch if not
52+
- v1-dep-master-
53+
# Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
54+
- v1-dep-
55+
# This is based on your 1.0 configuration file or project settings
56+
- run: npm install
57+
# Save dependency cache
58+
- save_cache:
59+
key: v1-dep-{{ .Branch }}-{{ epoch }}
60+
paths:
61+
# This is a broad list of cache paths to include many possible development environments
62+
# You can probably delete some of these entries
63+
- vendor/bundle
64+
- ~/virtualenvs
65+
- ~/.m2
66+
- ~/.ivy2
67+
- ~/.bundle
68+
- ~/.go_workspace
69+
- ~/.gradle
70+
- ~/.cache/bower
71+
- ./node_modules
72+
# Test
73+
# This would typically be a build job when using workflows, possibly combined with build
74+
# This is based on your 1.0 configuration file or project settings
75+
- run: npm run test
76+
# Deployment
77+
# Your existing circle.yml file contains deployment steps.
78+
# The config translation tool does not support translating deployment steps
79+
# since deployment in CircleCI 2.0 are better handled through workflows.
80+
# See the documentation for more information https://circleci.com/docs/2.0/workflows/
81+
# Teardown
82+
# If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
83+
# Save test results
84+
- store_test_results:
85+
path: /tmp/circleci-test-results
86+
# Save artifacts
87+
- store_artifacts:
88+
path: /tmp/circleci-artifacts
89+
- store_artifacts:
90+
path: /tmp/circleci-test-results

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-qrcode-svg",
3-
"version": "5.1.5",
3+
"version": "5.2.0",
44
"description": "A QR Code generator for React Native based on react-native-svg and javascript-qrcode.",
55
"main": "index.js",
66
"types": "index.d.ts",

0 commit comments

Comments
 (0)