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

remove TravisCI & Appveyor YAML #333

Merged
merged 2 commits into from
Apr 11, 2024
Merged

Conversation

jmckenna
Copy link
Member

@jmckenna jmckenna added this to the 1.14.1 release milestone Apr 11, 2024
@jmckenna jmckenna requested a review from jbo-ads April 11, 2024 14:36
Copy link
Member

@jbo-ads jbo-ads left a comment

Choose a reason for hiding this comment

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

After so long time, it is good to finally disable these checks. Thanks @jmckenna !

@jbo-ads
Copy link
Member

jbo-ads commented Apr 11, 2024

By the way, what about adding Ubuntu 22.04 and 24.04 to the list of checked OS?

@jmckenna
Copy link
Member Author

@jbo-ads I was wondering that also - will try in another pull request, thanks!

@jmckenna jmckenna merged commit 515115a into MapServer:main Apr 11, 2024
8 of 9 checks passed
Copy link

The backport to branch-1-14 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cc34db2... remove Travis & Appveyor YAML
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
CONFLICT (modify/delete): .travis.yml deleted in cc34db2 (remove Travis & Appveyor YAML) and modified in HEAD.  Version HEAD of .travis.yml left in tree.

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-branch-1-14 branch-1-14
# Navigate to the new working tree
cd .worktrees/backport-branch-1-14
# Create a new branch
git switch --create backport-333-to-branch-1-14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cc34db21041762c264b7492c9b1ddbd4fc467065,2aa93fd83e22b51801586fedff1b35cd777e46bb
# Push it to GitHub
git push --set-upstream origin backport-333-to-branch-1-14
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-1-14

Then, create a pull request where the base branch is branch-1-14 and the compare/head branch is backport-333-to-branch-1-14.

Copy link

The backport to branch-1-12 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cc34db2... remove Travis & Appveyor YAML
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
CONFLICT (modify/delete): .travis.yml deleted in cc34db2 (remove Travis & Appveyor YAML) and modified in HEAD.  Version HEAD of .travis.yml left in tree.

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-branch-1-12 branch-1-12
# Navigate to the new working tree
cd .worktrees/backport-branch-1-12
# Create a new branch
git switch --create backport-333-to-branch-1-12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cc34db21041762c264b7492c9b1ddbd4fc467065,2aa93fd83e22b51801586fedff1b35cd777e46bb
# Push it to GitHub
git push --set-upstream origin backport-333-to-branch-1-12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-1-12

Then, create a pull request where the base branch is branch-1-12 and the compare/head branch is backport-333-to-branch-1-12.

jmckenna added a commit that referenced this pull request Apr 11, 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