File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -33,6 +33,11 @@ if [[ "$IN_NIX_SHELL" ]]; then
3333 export EXTRA_BUILD_FLAGS=" "
3434 # Work around issue cloning inside a nix devshell https://github.com/NixOS/nixpkgs/issues/299949
3535 export CLONE_SRC=" ."
36+ # Make sure main is available in our workspace.
37+ # This is a workaround for the merge queue workflow.
38+ git fetch origin
39+ git checkout main
40+ git checkout $CODEBUILD_SOURCE_VERSION
3641else
3742 export DEST_DIR=" $SRC_ROOT " /bin
3843 export EXTRA_BUILD_FLAGS=" -DCMAKE_PREFIX_PATH=$LIBCRYPTO_ROOT "
@@ -52,11 +57,6 @@ if [[ -f "$s2nc_head" ]]; then
5257 fi
5358fi
5459
55- # Make sure main is available in our workspace.
56- # This is a workaround for the merge queue workflow.
57- git fetch origin
58- git checkout main
59- git checkout $CODEBUILD_SOURCE_VERSION
6060git clone --branch " main" --single-branch " $CLONE_SRC " " $BUILD_DIR "
6161
6262cmake " $BUILD_DIR " -B" $BUILD_DIR " /build " $EXTRA_BUILD_FLAGS " \
You can’t perform that action at this time.
0 commit comments