Skip to content

Commit

Permalink
Merge pull request conda-forge#1826 from jakirkham/simp_sha_config
Browse files Browse the repository at this point in the history
Fix local builds of feedstock submodules
  • Loading branch information
isuruf authored Jan 5, 2024
2 parents 00fcb77 + e2ed4d7 commit ae188fb
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 6 deletions.
6 changes: 0 additions & 6 deletions conda_smithy/templates/build_steps.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then
cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt"
fi

if [[ "${sha:-}" == "" ]]; then
pushd ${FEEDSTOCK_ROOT}
sha=$(git rev-parse HEAD)
popd
fi

if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then
EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}"
Expand Down
6 changes: 6 additions & 0 deletions conda_smithy/templates/run_docker_build.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then
export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT})
fi

if [[ "${sha:-}" == "" ]]; then
pushd "${FEEDSTOCK_ROOT}"
sha=$(git rev-parse HEAD)
popd
fi

docker info

# In order for the conda-build process in the container to write to the mounted
Expand Down
23 changes: 23 additions & 0 deletions news/fix_local_submodule_builds.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* Fix local builds of feedstocks submodules ( #1826 ).

**Security:**

* <news item>

0 comments on commit ae188fb

Please sign in to comment.