Skip to content

bypass "make docker-push" before merging PRs #364

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
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

bypass "make docker-push" before merging PRs #364

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
228e7e4
bypass "make docker-push" before merging PRs
andmat900 Feb 10, 2025
059210a
Revert "bypass "make docker-push" before merging PRs"
andmat900 Feb 19, 2025
19f8d67
run `make docker-push` in a separate step after merge
andmat900 Feb 19, 2025
f97f918
minor fix
andmat900 Feb 19, 2025
6fe3480
Update in 'commit changes' step
andmat900 Feb 19, 2025
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
9 changes: 8 additions & 1 deletion .github/workflows/generate-manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,17 @@ jobs:
[ "$VERSION" == "main" ] && VERSION=$(echo ${{ github.sha }} | cut -c1-8)
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
make docker-build docker-push split-installer IMG=$IMAGE_ID:$VERSION
echo "IMAGE_ID=$IMAGE_ID" >> $GITHUB_ENV
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#environment-files

echo "VERSION=$VERSION" >> $GITHUB_ENV
make docker-build split-installer IMG=$IMAGE_ID:$VERSION
mkdir -p manifests/controller
cp dist/* manifests/controller/
- name: Push docker image
if: github.event.pull_request.merged == true
run: |
make docker-push IMG=$IMAGE_ID:$VERSION
- name: Commit changes
if: github.event.pull_request.merged == true
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
Expand Down