Skip to content

fix(deploy-bump): scope git add to edited files, drop soft reset #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markusrubey wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(deploy-bump): scope git add to edited files, drop soft reset #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d84c0
fix(deploy-generic-v2): scope helm bump add to values.yaml, drop soft…
markusrubey May 20, 2026
94fbaa1
fix(deploy-generic-v1): mirror bump-add scoping into component-deploy…
markusrubey May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/component-deploy-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,15 @@ jobs:
working-directory: ./service-repo
env:
HELM_VALUES_PATH: ${{ inputs.helm-values-path || format('helm/{0}/{1}/app', inputs.service-identifier, inputs.stage) }}
COMMIT_MSG: "Bump docker tag for ${{ inputs.service-identifier }} on ${{ inputs.stage }} to ${{ inputs.image-tag }}"
run: |
git config user.name "GitHub Action"
git config user.email "action@github.com"

git add .
git commit -m "Bump docker tag for ${{ inputs.service-identifier }} on ${{ inputs.stage }} to ${{ inputs.image-tag }}"
# Stage only the file we sed-edited; a repo-wide `git add .` would
# sweep any other working-tree state into the bump commit.
git add "$HELM_VALUES_PATH/values.yaml"
git commit -m "$COMMIT_MSG"

for attempt in $(seq 1 10); do
echo "Push attempt $attempt..."
Expand All @@ -169,13 +172,16 @@ jobs:
echo "Rebase clean, retrying push..."
else
echo "Rebase conflict, re-applying changes on top of latest main..."
# Hard-reset rather than soft: soft leaves the old tree in the
# index, and a subsequent broad `git add` would commit a diff
# that silently reverts changes between the old and new base.
git rebase --abort
git reset --soft origin/main
git reset --hard origin/main
sed -i "s/tag: .*/tag: ${{ inputs.image-tag }}/" "$HELM_VALUES_PATH/values.yaml"
sed -i "s/revision: .*/revision: \"${GITHUB_SHA::8}\"/" "$HELM_VALUES_PATH/values.yaml"
sed -i "s/build: .*/build: ${{ github.run_number }}/" "$HELM_VALUES_PATH/values.yaml"
git add .
git commit -m "Bump docker tag for ${{ inputs.service-identifier }} on ${{ inputs.stage }} to ${{ inputs.image-tag }}"
git add "$HELM_VALUES_PATH/values.yaml"
git commit -m "$COMMIT_MSG"
fi
sleep 2
done
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/component-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,16 @@ jobs:
env:
APP_PATH: apps/${{ inputs.service-identifier }}/${{ inputs.stage }}/app
CLUSTER_PATH: apps/${{ inputs.service-identifier }}/${{ inputs.stage }}/cluster
COMMIT_MSG: "Bump docker tag for ${{ inputs.service-identifier }} on ${{ inputs.stage }} to ${{ inputs.image-tag }}"
run: |
git config user.name "GitHub Action"
git config user.email "action@github.com"

git add .
git commit -m "Bump docker tag for ${{ inputs.service-identifier }} on ${{ inputs.stage }} to ${{ inputs.image-tag }}"
# Stage only the two files the earlier steps edited; a repo-wide
# `git add .` would sweep any other working-tree state into the
# bump commit.
git add "$APP_PATH/values.yaml" "$CLUSTER_PATH/config.yaml"
git commit -m "$COMMIT_MSG"

for attempt in $(seq 1 10); do
echo "Push attempt $attempt..."
Expand All @@ -163,15 +167,18 @@ jobs:
echo "Rebase clean, retrying push..."
else
echo "Rebase conflict, re-applying changes on top of latest main..."
# Hard-reset rather than soft: soft leaves the old tree in the
# index, and a subsequent broad `git add` would commit a diff
# that silently reverts changes between the old and new base.
git rebase --abort
git reset --soft origin/main
git reset --hard origin/main
sed -i "s/tag: .*/tag: ${{ inputs.image-tag }}/" "$APP_PATH/values.yaml"
sed -i "s/revision: .*/revision: \"${GITHUB_SHA::8}\"/" "$APP_PATH/values.yaml"
sed -i "s/build: .*/build: ${{ github.run_number }}/" "$APP_PATH/values.yaml"
previousHash=$(yq e .currentHash "$CLUSTER_PATH/config.yaml") yq e '.previousHash = strenv(previousHash)' -i "$CLUSTER_PATH/config.yaml"
currentHash=${GITHUB_SHA::8} yq e '.currentHash = strenv(currentHash)' -i "$CLUSTER_PATH/config.yaml"
git add .
git commit -m "Bump docker tag for ${{ inputs.service-identifier }} on ${{ inputs.stage }} to ${{ inputs.image-tag }}"
git add "$APP_PATH/values.yaml" "$CLUSTER_PATH/config.yaml"
git commit -m "$COMMIT_MSG"
fi
sleep 2
done
Expand Down
Loading