Skip to content

Commit

Permalink
change channel to prefix (#1527)
Browse files Browse the repository at this point in the history
* upload with ratter build

* use only pixi channel

* fix compiler pkg

* fix script
  • Loading branch information
DerThorsten authored Jan 13, 2025
1 parent 8161a67 commit 876c605
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion emci/rattler_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def build_with_rattler(recipe=None, recipes_dir=None, emscripten_wasm32=False, s

# add conda forge and emscripten-forge channels
cmd.extend([
"-c", "https://repo.mamba.pm/emscripten-forge",
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
])
Expand Down
10 changes: 5 additions & 5 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cmd = [
# format
"--package-format", "tar-bz2",
# channels
"-c", "https://repo.mamba.pm/emscripten-forge",
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
Expand All @@ -38,7 +38,7 @@ cmd = [
# format
"--package-format", "tar-bz2",
# channels
"-c", "https://repo.mamba.pm/emscripten-forge",
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
Expand All @@ -53,7 +53,7 @@ cmd = [
# format
"--package-format", "tar-bz2",
# channels
"-c", "https://repo.mamba.pm/emscripten-forge",
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
Expand All @@ -73,7 +73,7 @@ cmd = [
# format
"--package-format", "tar-bz2",
# channels
"-c", "https://repo.mamba.pm/emscripten-forge",
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--target-platform", "emscripten-wasm32",
Expand All @@ -88,7 +88,7 @@ cmd = [
# format
"--package-format", "tar-bz2",
# channels
"-c", "https://repo.mamba.pm/emscripten-forge",
"-c", "https://repo.prefix.dev/emscripten-forge-dev",
"-c", "microsoft",
"-c", "conda-forge",
"--skip-existing", "local",
Expand Down
11 changes: 8 additions & 3 deletions recipes/recipes/emscripten_emscripten-wasm32/activate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ if [ -z ${CONDA_FORGE_EMSCRIPTEN_ACTIVATED+x} ]; then

export CONDA_FORGE_EMSCRIPTEN_ACTIVATED=1

export EMSDK_PYTHON=${BUILD_PREFIX}/bin/python3
export PYTHON=${BUILD_PREFIX}/bin/python3
if [ -z ${BUILD_PREFIX+x} ]; then
export EMSDK_PYTHON=${CONDA_PREFIX}/bin/python3
export PYTHON=${CONDA_PREFIX}/bin/python3
else
export EMSDK_PYTHON=${BUILD_PREFIX}/bin/python3
export PYTHON=${BUILD_PREFIX}/bin/python3
fi

CONDA_EMSDK_DIR=$CONDA_PREFIX/opt/emsdk

Expand Down Expand Up @@ -59,4 +64,4 @@ if [ -z ${CONDA_FORGE_EMSCRIPTEN_ACTIVATED+x} ]; then
# wasm bigint
export LDFLAGS="$LDFLAGS -sWASM_BIGINT"

fi
fi
2 changes: 1 addition & 1 deletion recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ context:
version: 3.1.73

build:
number: 4
number: 5


outputs:
Expand Down

0 comments on commit 876c605

Please sign in to comment.