From 9505ae4abc11daccd8f775fba47772a8015f1932 Mon Sep 17 00:00:00 2001 From: Gonzalo Pena-Castellanos Date: Mon, 23 Dec 2019 19:18:49 -0500 Subject: [PATCH] Fix win bash env activation --- .github/workflows/example-1.yml | 6 +++--- .github/workflows/example-2.yml | 15 ++++++++++----- .github/workflows/example-3.yml | 6 +++--- README.md | 14 +++++++------- dist/index.js | 3 ++- src/setup-conda.ts | 1 + 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.github/workflows/example-1.yml b/.github/workflows/example-1.yml index ca6b4835..af2f68f0 100644 --- a/.github/workflows/example-1.yml +++ b/.github/workflows/example-1.yml @@ -3,10 +3,10 @@ name: "Example 1: Basic usage" on: push: branches: - - master + - '*' pull_request: branches: - - master + - '*' jobs: example-1: @@ -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 }} diff --git a/.github/workflows/example-2.yml b/.github/workflows/example-2.yml index 9211a275..73b01b27 100644 --- a/.github/workflows/example-2.yml +++ b/.github/workflows/example-2.yml @@ -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 @@ -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 @@ -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 @@ -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: | diff --git a/.github/workflows/example-3.yml b/.github/workflows/example-3.yml index d9ab0b53..9ff983ae 100644 --- a/.github/workflows/example-3.yml +++ b/.github/workflows/example-3.yml @@ -3,10 +3,10 @@ name: "Example 3: Other options" on: push: branches: - - master + - '*' pull_request: branches: - - master + - '*' jobs: example-3: @@ -14,7 +14,7 @@ jobs: 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 diff --git a/README.md b/README.md index 6dce486e..b4de1211 100644 --- a/README.md +++ b/README.md @@ -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: @@ -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: @@ -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: diff --git a/dist/index.js b/dist/index.js index 4eda634d..5654afd9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -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 */, @@ -30371,6 +30371,7 @@ conda activate ${activateEnvironment}`; :: ---------------------------------------------------------------------------`; let extraShells; const shells = { + "~/.bash_profile": bashExtraText, "~/.profile": bashExtraText, "~/.zshrc": bashExtraText, "~/.config/fish/config.fish": bashExtraText, diff --git a/src/setup-conda.ts b/src/setup-conda.ts index 2f8cd0cd..eb5e5fff 100644 --- a/src/setup-conda.ts +++ b/src/setup-conda.ts @@ -456,6 +456,7 @@ conda activate ${activateEnvironment}`; let extraShells: object; const shells = { + "~/.bash_profile": bashExtraText, "~/.profile": bashExtraText, "~/.zshrc": bashExtraText, "~/.config/fish/config.fish": bashExtraText,