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.

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

Minor generation workflow bugfix #2187

Merged
merged 2 commits into from
Jul 17, 2023
Merged

Minor generation workflow bugfix #2187

merged 2 commits into from
Jul 17, 2023

Conversation

flobernd
Copy link
Member

Makes sure to only commit files in the ./output directory.

@@ -24,6 +24,8 @@ defaults:
jobs:
build:
runs-on: ubuntu-latest
# The actor check currently does not work. The `secrets.PAT` belongs to `delvedor` and not
Copy link
Member Author

Choose a reason for hiding this comment

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

This is not a huge problem for now as the Check for Changed Files step prevents the workflow from being triggered infinitely, but should be addressed sooner or later.

@flobernd flobernd enabled auto-merge (squash) July 17, 2023 14:10
@flobernd flobernd merged commit 33e8a1c into main Jul 17, 2023
4 checks passed
@flobernd flobernd deleted the ci-auto-compile-fix branch July 17, 2023 14:11
@github-actions
Copy link
Contributor

The backport to 8.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.0 8.0
# Navigate to the new working tree
cd .worktrees/backport-8.0
# Create a new branch
git switch --create backport-2187-to-8.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 33e8a1c9cad22a5946ac735c4fba31af2da2cec2
# Push it to GitHub
git push --set-upstream origin backport-2187-to-8.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.0

Then, create a pull request where the base branch is 8.0 and the compare/head branch is backport-2187-to-8.0.

@github-actions
Copy link
Contributor

The backport to 7.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.17 7.17
# Navigate to the new working tree
cd .worktrees/backport-7.17
# Create a new branch
git switch --create backport-2187-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 33e8a1c9cad22a5946ac735c4fba31af2da2cec2
# Push it to GitHub
git push --set-upstream origin backport-2187-to-7.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.17

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-2187-to-7.17.

github-actions bot pushed a commit that referenced this pull request Jul 17, 2023
github-actions bot pushed a commit that referenced this pull request Jul 17, 2023
github-actions bot pushed a commit that referenced this pull request Jul 17, 2023
github-actions bot pushed a commit that referenced this pull request Jul 17, 2023
github-actions bot pushed a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 17, 2023
flobernd added a commit that referenced this pull request Jul 18, 2023
flobernd added a commit that referenced this pull request Jul 18, 2023
pquentin added a commit that referenced this pull request Jun 20, 2024
pquentin added a commit that referenced this pull request Jun 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants