mumrah commented on code in PR #17204: URL: https://github.com/apache/kafka/pull/17204#discussion_r1779501913
########## committer-tools/update-cache.sh: ########## @@ -0,0 +1,49 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +if ! git config --get alias.update-cache > /dev/null; then + printf '\e[36m%s\n\n %s\n\e[0m\n' \ + 'Hint: you can create a Git alias to execute this script. Example:' \ + "git config alias.update-cache '!bash $(realpath "$0")'" +fi + +key="$( + gh cache list \ + --key 'gradle-home-v1|Linux-X64|test' \ + --sort 'created_at' \ + --limit 1 \ + --json 'key' \ + --jq '.[].key' +)" + +sha="$(cut -d '-' -f 5 <<< "$key")" + +git fetch origin trunk &> /dev/null Review Comment: as you mentioned, we can't rely on `origin` so lets remove this. ########## committer-tools/update-cache.sh: ########## @@ -0,0 +1,49 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +if ! git config --get alias.update-cache > /dev/null; then + printf '\e[36m%s\n\n %s\n\e[0m\n' \ + 'Hint: you can create a Git alias to execute this script. Example:' \ + "git config alias.update-cache '!bash $(realpath "$0")'" +fi + +key="$( + gh cache list \ + --key 'gradle-home-v1|Linux-X64|test' \ + --sort 'created_at' \ + --limit 1 \ + --json 'key' \ + --jq '.[].key' +)" + +sha="$(cut -d '-' -f 5 <<< "$key")" + +git fetch origin trunk &> /dev/null + +if ! git rev-parse --verify "$sha" &> /dev/null; then + printf '\e[33m%s\n%s\e[0m\n' \ + "Cannot update 'trunk-cached' because SHA $sha" \ + "does not exist locally. Please update your remote and try again." +else + git switch trunk-cached &> /dev/null || git switch -c trunk-cached &> /dev/null + if git merge "$sha" &> /dev/null; then + printf '%s\n' "Local branch 'trunk-cached' successfully updated to $sha." Review Comment: Can we use a short ref for the SHA and include its relative commit date in this message? E.g., > Local branch 'trunk-cached' successfully updated to 16cac97873 from 2 hours ago. ########## committer-tools/update-cache.sh: ########## @@ -0,0 +1,49 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +if ! git config --get alias.update-cache > /dev/null; then + printf '\e[36m%s\n\n %s\n\e[0m\n' \ + 'Hint: you can create a Git alias to execute this script. Example:' \ + "git config alias.update-cache '!bash $(realpath "$0")'" +fi + +key="$( + gh cache list \ + --key 'gradle-home-v1|Linux-X64|test' \ + --sort 'created_at' \ + --limit 1 \ + --json 'key' \ + --jq '.[].key' +)" + +sha="$(cut -d '-' -f 5 <<< "$key")" + +git fetch origin trunk &> /dev/null + +if ! git rev-parse --verify "$sha" &> /dev/null; then + printf '\e[33m%s\n%s\e[0m\n' \ + "Cannot update 'trunk-cached' because SHA $sha" \ + "does not exist locally. Please update your remote and try again." +else + git switch trunk-cached &> /dev/null || git switch -c trunk-cached &> /dev/null + if git merge "$sha" &> /dev/null; then Review Comment: Since this script is managing the `trunk-cached` ref exclusively, lets just use `git update-ref`. ``` git update-ref -m 'some message' trunk-cached $sha ``` if the SHA doesn't exist, it will fail with a non-zero exit code -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
