Skip to content
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

(fix): change gha to target main #1448

Merged
merged 1 commit into from
Dec 19, 2024
Merged

(fix): change gha to target main #1448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/pre-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ jobs:
skopeo copy docker://quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator:pr-${{ github.event.pull_request.number }} docker://quay.io/${{ secrets.QUAY_ORG }}/opendatahub-operator:v${{ env.VERSION }}
echo "Successfully updated tag to quay.io with version: v${{ env.VERSION }}"
- uses: actions/checkout@v4
- name: Create version update pr in incubation
- name: Create version update pr in main
uses: ./.github/actions/update-release-version
with:
version: ${{ env.VERSION }}
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "Update version to ${{ env.VERSION }}"
title: "Update version to ${{ env.VERSION }}"
branch-name: "odh-release/version-update"
base-branch: incubation
base-branch: main
- name: Create release branch
run: |
git fetch origin incubation:incubation
git checkout incubation
git fetch origin main:main
git checkout main
git checkout -b odh-${{ env.VERSION }}
git push -f origin odh-${{ env.VERSION }}
Copy link
Contributor

@ykaliuta ykaliuta Dec 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Unrelated to the patch, but if intention is to make a copy of the branch in the remote, it may be a bit simplified as git fetch origin main; git push origin FETCH_HEAD:refs/heads/odh-${{ env.VERSION }}

Can the branch name somehow be parametrized?

The PR itself looks good to me

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes it could be done. I can do that in a separate pr. Thanks for the idea @ykaliuta

- uses: ./.github/actions/update-manifest-branches
Expand Down
Loading