379522dc9f
98f23071 Merge pull request #260 from TerryHowe/update-csi-driver-version e9d8712d Merge pull request #259 from stmcginnis/deprecated-kind-kube-root faf79ff6 Remove --kube-root deprecated kind argument 734c2b95 Merge pull request #265 from Rakshith-R/consider-main-branch f95c855b Merge pull request #262 from huww98/golang-toolchain 3c8d966f Treat main branch as equivalent to master branch e31de525 Merge pull request #261 from huww98/golang fd153a9e Bump golang to 1.23.1 a8b3d050 pull-test.sh: fix "git subtree pull" errors 6b05f0fc use new GOTOOLCHAIN env to manage go version 18b6ac6d chore: update CSI driver version to 1.15 git-subtree-dir: release-tools git-subtree-split: 98f23071d946dd3de3188a7e1f84679067003162
39 lines
1.4 KiB
Bash
Executable File
39 lines
1.4 KiB
Bash
Executable File
#! /bin/sh
|
|
|
|
# Copyright 2021 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# This script is called by pull Prow jobs for the csi-release-tools
|
|
# repo to ensure that the changes in the PR work when imported into
|
|
# some other repo.
|
|
|
|
set -ex
|
|
|
|
# Prow checks out repos with --filter=blob:none. This breaks
|
|
# "git subtree pull" unless we enable fetching missing file content.
|
|
GIT_NO_LAZY_FETCH=0
|
|
export GIT_NO_LAZY_FETCH
|
|
|
|
# It must be called inside the updated csi-release-tools repo.
|
|
CSI_RELEASE_TOOLS_DIR="$(pwd)"
|
|
|
|
# Update the other repo.
|
|
cd "$PULL_TEST_REPO_DIR"
|
|
git reset --hard # Shouldn't be necessary, but somehow is to avoid "fatal: working tree has modifications. Cannot add." (https://stackoverflow.com/questions/3623351/git-subtree-pull-says-that-the-working-tree-has-modifications-but-git-status-sa)
|
|
git subtree pull --squash --prefix=release-tools "$CSI_RELEASE_TOOLS_DIR" master
|
|
git log -n2
|
|
|
|
# Now fall through to testing.
|
|
exec ./.prow.sh
|