Skip to content

Commit f0a4290

Browse files
authored
Merge pull request #38 from martinRenou/use_yarn
Use yarn instead of npm
2 parents ebfdea0 + c715ad5 commit f0a4290

File tree

3 files changed

+63
-71
lines changed

3 files changed

+63
-71
lines changed

.github/workflows/main.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
branches:
99
- master
1010

11+
defaults:
12+
run:
13+
shell: bash -l {0}
14+
1115
jobs:
1216
run:
1317
runs-on: ${{ matrix.os }}
@@ -17,19 +21,18 @@ jobs:
1721
matrix:
1822
os: [ubuntu-latest]
1923

20-
steps:
2124
- name: Checkout
2225
uses: actions/checkout@v2
2326

2427
- name: Setup conda
25-
uses: s-weigand/setup-conda@v1
28+
uses: conda-incubator/setup-miniconda@v2
2629
with:
27-
auto-update-conda: true
28-
update-conda: true
29-
conda-channels: conda-forge
30+
python-version: ${{ matrix.python-version }}
31+
mamba-version: "*"
32+
channels: conda-forge
3033

31-
- name: Conda install dependencies
32-
run: conda install nodejs
34+
- name: Mamba install dependencies
35+
run: mamba install yarn
3336

3437
- name: Test install
35-
run: npm install && npm run build
38+
run: yarn install && yarn run build

package-lock.json

-63
This file was deleted.

yarn.lock

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
"@types/node@^10.17.13":
6+
version "10.17.51"
7+
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.51.tgz#639538575befbcf3d3861f95c41de8e47124d674"
8+
integrity sha512-KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==
9+
10+
backbone@^1.4.0:
11+
version "1.4.0"
12+
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
13+
integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
14+
dependencies:
15+
underscore ">=1.8.3"
16+
17+
binary-search-tree@^0.2.6:
18+
version "0.2.6"
19+
resolved "https://registry.yarnpkg.com/binary-search-tree/-/binary-search-tree-0.2.6.tgz#c6d29194e286827fcffe079010e6bf77def10ce3"
20+
integrity sha1-xtKRlOKGgn/P/geQEOa/d97xDOM=
21+
dependencies:
22+
underscore "~1.4.4"
23+
24+
jquery@^3.4.1:
25+
version "3.5.1"
26+
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
27+
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
28+
29+
three@^0.118.0:
30+
version "0.118.3"
31+
resolved "https://registry.yarnpkg.com/three/-/three-0.118.3.tgz#c0bf8c10a68155478f12f4ccac2ff979526a4a0a"
32+
integrity sha512-ijECXrNzDkHieoeh2H69kgawTGH8DiamhR4uBN8jEM7VHSKvfTdEvOoHsA8Aq7dh7PHAxhlqBsN5arBI3KixSw==
33+
34+
typescript@~3.1.2:
35+
version "3.1.6"
36+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
37+
integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
38+
39+
underscore@>=1.8.3:
40+
version "1.12.0"
41+
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.0.tgz#4814940551fc80587cef7840d1ebb0f16453be97"
42+
integrity sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==
43+
44+
underscore@~1.4.4:
45+
version "1.4.4"
46+
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
47+
integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
48+
49+
uuid@^3.3.3:
50+
version "3.4.0"
51+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
52+
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

0 commit comments

Comments
 (0)