Skip to content

Commit

Permalink
Merge pull request #6 from goanpeca/fix/bash-win
Browse files Browse the repository at this point in the history
PR: Fix/bash win
  • Loading branch information
goanpeca authored Dec 24, 2019
2 parents f1c6d3e + 9505ae4 commit bde5ac1
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/example-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: "Example 1: Basic usage"
on:
push:
branches:
- master
- '*'
pull_request:
branches:
- master
- '*'

jobs:
example-1:
Expand All @@ -18,7 +18,7 @@ jobs:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: ['3.7', '2.7']
steps:
- uses: goanpeca/setup-miniconda@master
- uses: goanpeca/setup-miniconda@v1
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/example-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ name: "Example 2: Other shells"
on:
push:
branches:
- master
- '*'
pull_request:
branches:
- master
- '*'

jobs:
example-2-linux:
name: Ex2 Linux
runs-on: 'ubuntu-latest'
steps:
- uses: goanpeca/setup-miniconda@master
- uses: goanpeca/setup-miniconda@v1
with:
miniconda-version: 'latest'
activate-environment: foo
Expand All @@ -37,7 +37,7 @@ jobs:
name: Ex2 Mac
runs-on: 'macos-latest'
steps:
- uses: goanpeca/setup-miniconda@master
- uses: goanpeca/setup-miniconda@v1
with:
miniconda-version: 'latest'
activate-environment: foo
Expand All @@ -61,7 +61,7 @@ jobs:
name: Ex2 Windows
runs-on: 'windows-latest'
steps:
- uses: goanpeca/setup-miniconda@master
- uses: goanpeca/setup-miniconda@v1
with:
miniconda-version: 'latest'
activate-environment: foo
Expand All @@ -70,6 +70,11 @@ jobs:
run: |
conda info
conda list
- name: Sh
shell: sh -l {0}
run: |
conda info
conda list
- name: PowerShell
shell: powershell
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/example-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ name: "Example 3: Other options"
on:
push:
branches:
- master
- '*'
pull_request:
branches:
- master
- '*'

jobs:
example-3:
name: Ex3 Linux
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v2
- uses: goanpeca/setup-miniconda@master
- uses: goanpeca/setup-miniconda@v1
with:
activate-environment: anaconda-client-env
environment-file: etc/example-environment.yml
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ This example shows how to set a basic python workflow with conda using the cross
on:
push:
branches:
- master
- '*'
pull_request:
branches:
- master
- '*'

jobs:
example-1:
Expand All @@ -49,16 +49,16 @@ jobs:
## Example 2: Other shells
This example shows how to use all other available shells for specific operating systems. On this example we select to download the latest anaconda version available and create and activate by default an environment named `foo`
This example shows how to use all other available shells for specific operating systems. On this example we select to download the latest anaconda version available and create and activate by default an environment named `foo`.

```yaml
on:
push:
branches:
- master
- '*'
pull_request:
branches:
- master
- '*'
jobs:
example-2-linux:
Expand Down Expand Up @@ -148,10 +148,10 @@ This example shows how to use [environment.yml](etc/example-environment.yml) for
on:
push:
branches:
- master
- '*'
pull_request:
branches:
- master
- '*'
jobs:
example-3:
Expand Down
3 changes: 2 additions & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29388,7 +29388,7 @@ module.exports = hashDelete;
/* 858 */
/***/ (function(module) {

module.exports = {"_from":"cheerio@^1.0.0-rc.2","_id":"cheerio@1.0.0-rc.3","_inBundle":false,"_integrity":"sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==","_location":"/cheerio","_phantomChildren":{},"_requested":{"type":"range","registry":true,"raw":"cheerio@^1.0.0-rc.2","name":"cheerio","escapedName":"cheerio","rawSpec":"^1.0.0-rc.2","saveSpec":null,"fetchSpec":"^1.0.0-rc.2"},"_requiredBy":["/get-hrefs"],"_resolved":"https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz","_shasum":"094636d425b2e9c0f4eb91a46c05630c9a1a8bf6","_spec":"cheerio@^1.0.0-rc.2","_where":"/Users/gpena-castellanos/develop/quansight/action-setup-conda/node_modules/get-hrefs","author":{"name":"Matt Mueller","email":"mattmuelle@gmail.com","url":"mat.io"},"bugs":{"url":"https://github.com/cheeriojs/cheerio/issues"},"bundleDependencies":false,"dependencies":{"css-select":"~1.2.0","dom-serializer":"~0.1.1","entities":"~1.1.1","htmlparser2":"^3.9.1","lodash":"^4.15.0","parse5":"^3.0.1"},"deprecated":false,"description":"Tiny, fast, and elegant implementation of core jQuery designed specifically for the server","devDependencies":{"benchmark":"^2.1.0","coveralls":"^2.11.9","expect.js":"~0.3.1","istanbul":"^0.4.3","jquery":"^3.0.0","jsdom":"^9.2.1","jshint":"^2.9.2","mocha":"^3.1.2","xyz":"~1.1.0"},"engines":{"node":">= 0.6"},"files":["index.js","lib"],"homepage":"https://github.com/cheeriojs/cheerio#readme","keywords":["htmlparser","jquery","selector","scraper","parser","html"],"license":"MIT","main":"./index.js","name":"cheerio","repository":{"type":"git","url":"git://github.com/cheeriojs/cheerio.git"},"scripts":{"test":"make test"},"version":"1.0.0-rc.3"};
module.exports = {"_args":[["cheerio@1.0.0-rc.3","/Users/gpena-castellanos/develop/quansight/setup-miniconda"]],"_from":"cheerio@1.0.0-rc.3","_id":"cheerio@1.0.0-rc.3","_inBundle":false,"_integrity":"sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==","_location":"/cheerio","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"cheerio@1.0.0-rc.3","name":"cheerio","escapedName":"cheerio","rawSpec":"1.0.0-rc.3","saveSpec":null,"fetchSpec":"1.0.0-rc.3"},"_requiredBy":["/get-hrefs"],"_resolved":"https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz","_spec":"1.0.0-rc.3","_where":"/Users/gpena-castellanos/develop/quansight/setup-miniconda","author":{"name":"Matt Mueller","email":"mattmuelle@gmail.com","url":"mat.io"},"bugs":{"url":"https://github.com/cheeriojs/cheerio/issues"},"dependencies":{"css-select":"~1.2.0","dom-serializer":"~0.1.1","entities":"~1.1.1","htmlparser2":"^3.9.1","lodash":"^4.15.0","parse5":"^3.0.1"},"description":"Tiny, fast, and elegant implementation of core jQuery designed specifically for the server","devDependencies":{"benchmark":"^2.1.0","coveralls":"^2.11.9","expect.js":"~0.3.1","istanbul":"^0.4.3","jquery":"^3.0.0","jsdom":"^9.2.1","jshint":"^2.9.2","mocha":"^3.1.2","xyz":"~1.1.0"},"engines":{"node":">= 0.6"},"files":["index.js","lib"],"homepage":"https://github.com/cheeriojs/cheerio#readme","keywords":["htmlparser","jquery","selector","scraper","parser","html"],"license":"MIT","main":"./index.js","name":"cheerio","repository":{"type":"git","url":"git://github.com/cheeriojs/cheerio.git"},"scripts":{"test":"make test"},"version":"1.0.0-rc.3"};

/***/ }),
/* 859 */,
Expand Down Expand Up @@ -30371,6 +30371,7 @@ conda activate ${activateEnvironment}`;
:: ---------------------------------------------------------------------------`;
let extraShells;
const shells = {
"~/.bash_profile": bashExtraText,
"~/.profile": bashExtraText,
"~/.zshrc": bashExtraText,
"~/.config/fish/config.fish": bashExtraText,
Expand Down
1 change: 1 addition & 0 deletions src/setup-conda.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ conda activate ${activateEnvironment}`;

let extraShells: object;
const shells = {
"~/.bash_profile": bashExtraText,
"~/.profile": bashExtraText,
"~/.zshrc": bashExtraText,
"~/.config/fish/config.fish": bashExtraText,
Expand Down

0 comments on commit bde5ac1

Please sign in to comment.