Skip to content

Commit

Permalink
Merge pull request #345 from conda-incubator/debug-no-conda
Browse files Browse the repository at this point in the history
  • Loading branch information
goanpeca committed Apr 23, 2024
2 parents 3ec85ce + 8cd84f7 commit 333e129
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 12 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/example-13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
os: ["macos-14"]
variant:
["Miniforge3", "Mambaforge", "Miniconda", "no-variant", "empty-with"]
include:
# This is Intel, not Apple Silicon, but doesn't bundle Miniconda
- os: macos-13
variant: empty-with
steps:
- uses: actions/checkout@v4
- uses: ./
Expand Down Expand Up @@ -74,7 +78,8 @@ jobs:
- name: Install Python
shell: bash -el {0}
run: conda install -y python
- name: Check arm64
- name: Check architecture
if: matrix.os != 'macos-13'
shell: bash -el {0}
run: |
python -c "import platform; assert platform.machine() == 'arm64', platform.machine()"
6 changes: 4 additions & 2 deletions dist/setup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49001,7 +49001,7 @@ exports.ensureLocalInstaller = ensureLocalInstaller;
/***/ }),

/***/ 3390:
/***/ (function(__unused_webpack_module, exports) {
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

"use strict";

Expand All @@ -49016,6 +49016,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.bundledMinicondaUser = void 0;
const constants_1 = __nccwpck_require__(9042);
/**
* Provide a path to the pre-bundled (but probably old) Miniconda base installation
*
Expand All @@ -49030,7 +49031,8 @@ exports.bundledMinicondaUser = {
inputs.miniforgeVariant === "" &&
inputs.miniforgeVersion === "" &&
inputs.architecture === "x64" &&
inputs.installerUrl === "");
inputs.installerUrl === "" &&
constants_1.MINICONDA_DIR_PATH.length > 0);
}),
installerPath: (inputs, options) => __awaiter(void 0, void 0, void 0, function* () {
// No actions are performed. This is the only place `useBundled` will ever be true.
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/installer/bundled-miniconda.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as types from "../types";
import { MINICONDA_DIR_PATH } from "../constants";

/**
* Provide a path to the pre-bundled (but probably old) Miniconda base installation
Expand All @@ -15,7 +16,8 @@ export const bundledMinicondaUser: types.IInstallerProvider = {
inputs.miniforgeVariant === "" &&
inputs.miniforgeVersion === "" &&
inputs.architecture === "x64" &&
inputs.installerUrl === ""
inputs.installerUrl === "" &&
MINICONDA_DIR_PATH.length > 0
);
},
installerPath: async (inputs, options) => {
Expand Down

0 comments on commit 333e129

Please sign in to comment.