diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml index 8cd3f1e6c..f96432510 100644 --- a/.github/workflows/testpr.yml +++ b/.github/workflows/testpr.yml @@ -113,7 +113,7 @@ jobs: - name: Build recipes shell: bash -l {0} run: | - pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-staging --skip-existing + pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-noetic --skip-existing - name: See packages that will be saved in cache shell: bash -l {0} diff --git a/.scripts/build_unix.sh b/.scripts/build_unix.sh index b6c63c849..a166cab2f 100755 --- a/.scripts/build_unix.sh +++ b/.scripts/build_unix.sh @@ -40,7 +40,7 @@ for recipe in ${CURRENT_RECIPES[@]}; do pixi run -v rattler-build build \ --recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \ -m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \ - -c conda-forge -c robostack-staging \ + -c conda-forge -c robostack-noetic \ ${extra_channel} \ --output-dir $CONDA_BLD_PATH \ ${cross_compile} diff --git a/.scripts/build_win.bat b/.scripts/build_win.bat index dfbcb1592..5f9170802 100644 --- a/.scripts/build_win.bat +++ b/.scripts/build_win.bat @@ -18,7 +18,7 @@ for %%X in (%CURRENT_RECIPES%) do ( cd %FEEDSTOCK_ROOT%\recipes\%%X\ pixi run -v rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^ -m %FEEDSTOCK_ROOT%\conda_build_config.yaml ^ - -c robostack-staging -c conda-forge ^ + -c robostack-noetic -c conda-forge ^ --output-dir %CONDA_BLD_PATH% if errorlevel 1 exit 1 diff --git a/pixi.toml b/pixi.toml index d5cf747fd..a8c42cac8 100644 --- a/pixi.toml +++ b/pixi.toml @@ -30,12 +30,12 @@ vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "0e75b9673808de3 generate-recipes = { cmd = "vinca -m", depends-on = ["remove-recipes"] } generate-gha-workflows = { cmd = "vinca-gha --trigger-branch dummy_build_branch_as_it_is_unused -d ./recipes", depends-on = ["generate-recipes"] } check-patches = { cmd = "python check_patches_clean_apply.py", depends-on = ["generate-recipes"] } -build_continue_on_failure = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --continue-on-failure --skip-existing", depends-on = ["generate-recipes"] } +build_continue_on_failure = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-noetic -c https://repo.prefix.dev/conda-forge --continue-on-failure --skip-existing", depends-on = ["generate-recipes"] } create_snapshot = { cmd = "vinca-snapshot -d noetic -o rosdistro_snapshot.yaml" } -upload = "rattler-build upload anaconda -o robostack-staging -a $ANACONDA_API_TOKEN" +upload = "rattler-build upload anaconda -o robostack-noetic -a $ANACONDA_API_TOKEN" [tasks.build] -cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c https://prefix.dev/robostack-staging -c https://prefix.dev/conda-forge --skip-existing" +cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c https://prefix.dev/robostack-noetic -c https://prefix.dev/conda-forge --skip-existing" depends-on = ["generate-recipes"] description = "Build all packages, from the ./recipes dir. This will skip already existing packages, so it can be used to build only a subset of packages by first removing the recipes of the packages you want to rebuild (see `pixi remove-recipes`)." @@ -44,6 +44,6 @@ cmd = "rm -rf recipes_only_patch; rm -rf recipes; mkdir recipes" description = "Remove all generated recipes, before regenerating them." [tasks.build-one] -cmd = "cp ./patch/{{ PACKAGE }}.*patch ./recipes/{{ PACKAGE }}/patch/; rattler-build build --recipe ./recipes/{{ PACKAGE }}/recipe.yaml -m ./conda_build_config.yaml -c https://prefix.dev/robostack-staging -c https://prefix.dev/conda-forge" +cmd = "cp ./patch/{{ PACKAGE }}.*patch ./recipes/{{ PACKAGE }}/patch/; rattler-build build --recipe ./recipes/{{ PACKAGE }}/recipe.yaml -m ./conda_build_config.yaml -c https://prefix.dev/robostack-noetic -c https://prefix.dev/conda-forge" args = [{ arg = "PACKAGE", default = "ros-noetic-ros-workspace" }] description = "Build a single package, from the ./recipes dir. Add the `ros-noetic-` prefix to the package name, e.g. `pixi build-one --package ros-noetic-ros-workspace`" diff --git a/vinca.yaml b/vinca.yaml index f81c4b228..775aa7f4a 100644 --- a/vinca.yaml +++ b/vinca.yaml @@ -63,7 +63,7 @@ packages_remove_from_deps: skip_existing: # - output - - https://conda.anaconda.org/robostack-staging/ + - https://conda.anaconda.org/robostack-noetic/ packages_select_by_deps: # Core ROS packages