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

Use stable branches for gz-rendering and sdformat #995

Merged
merged 1 commit into from
Aug 29, 2023
Merged

Use stable branches for gz-rendering and sdformat #995

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions jenkins-scripts/dsl/gz-collections.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ collections:
- name: gz-rendering
major_version: 8
repo:
current_branch: main
current_branch: gz-rendering8
- name: sdformat
major_version: 14
repo:
current_branch: main
current_branch: sdf14
- name: gz-fuel-tools
major_version: 9
repo:
Expand Down
5 changes: 2 additions & 3 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ gz_branches = [ 'cmake' : [ '3' ],
'gui' : [ '7' ],
'launch' : [ '6' ],
'math' : [ '7' ],
'msgs' : [ '9', '10' ],
'msgs' : [ '9', '10'],
'physics' : [ '6' ],
'plugin' : [ '2' ],
'rendering' : [ '7' ],
'rendering' : [ '7' , '8'],
'sensors' : [ '7' ],
'sim' : [ '7' ],
'tools' : [ '2' ],
Expand All @@ -87,7 +87,6 @@ gz_extra_debbuild = [ 'gui8',
'fuel-tools9',
'launch7',
'physics7',
'rendering8',
'sensors8',
'sim8',
'transport13',
Expand Down
12 changes: 6 additions & 6 deletions jenkins-scripts/dsl/ignition_collection.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ gz_collection_jobs =
'ign_msgs-gz-10-win',
'ign_physics-gz-6-win',
'ign_plugin-gz-2-win',
'ign_rendering-ci-win',
'ign_rendering-gz-8-win',
'ign_sensors-ci-win',
'ign_tools-gz-2-win',
'ign_transport-gz-13-win',
Expand All @@ -299,7 +299,7 @@ gz_collection_jobs =
'gz_msgs-ci-gz-msgs10-jammy-amd64',
'gz_physics-ci-gz-physics6-jammy-amd64',
'gz_plugin-ci-gz-plugin2-jammy-amd64',
'gz_rendering-ci-main-jammy-amd64',
'gz_rendering-ci-gz-rendering8-jammy-amd64',
'gz_sensors-ci-main-jammy-amd64',
'gz_sim-ci-main-jammy-amd64',
'gz_tools-ci-gz-tools2-jammy-amd64',
Expand All @@ -316,14 +316,14 @@ gz_collection_jobs =
'ignition_msgs-ci-gz-msgs10-homebrew-amd64',
'ignition_physics-ci-gz-physics6-homebrew-amd64',
'ignition_plugin-ci-gz-plugin2-homebrew-amd64',
'ignition_rendering-ci-main-homebrew-amd64',
'ignition_rendering-ci-gz-rendering8-homebrew-amd64',
'ignition_sensors-ci-main-homebrew-amd64',
'ignition_tools-ci-gz-tools2-homebrew-amd64',
'ignition_transport-ci-gz-transport13-homebrew-amd64',
'ignition_utils-ci-gz-utils2-homebrew-amd64',
'sdformat-ci-main-jammy-amd64',
'sdformat-ci-main-homebrew-amd64',
'sdformat-sdf-main-win'
'sdformat-ci-sdformat14-jammy-amd64',
'sdformat-ci-sdformat14-homebrew-amd64',
'sdformat-sdf-14-win'
],
]

Expand Down
8 changes: 6 additions & 2 deletions source-repo-scripts/merge_forward_pull_request.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ fi

set -e

CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
REMOTE_BRANCH=$(git rev-parse --abbrev-ref HEAD@{upstream})
REMOTE=${REMOTE_BRANCH/\/$LOCAL_BRANCH/}
CURRENT_BRANCH="${REMOTE}:${LOCAL_BRANCH}"

ORIGIN_URL=$(git remote get-url origin)
ORIGIN_ORG_REPO=$(echo ${ORIGIN_URL} | sed -e 's@.*github\.com.@@' | sed -e 's/\.git//g')
Expand All @@ -58,4 +61,5 @@ gh pr create \
--repo "$ORIGIN_ORG_REPO" \
--base "$TO_BRANCH" \
--body "$BODY" \
--head "$CURRENT_BRANCH"
--head "$CURRENT_BRANCH" \
--web
Copy link
Contributor

Choose a reason for hiding this comment

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

this script doesn't work well for me anymore since these changes, using the latest gh from homebrew. It used to just open the pull request with the body completely filled out, but now it opens a web browser without filling in everything. @azeey which version of gh have you tested with?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have 2.27.0. I didn't actually mean to make this change in this PR, so we can remove it if it's not working for you. I do like the --web flag though, since I can review the PR body/title before creating it or avoid accidentally creating PRs.

8 changes: 6 additions & 2 deletions source-repo-scripts/release_pull_request.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ fi

set -e

CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
REMOTE_BRANCH=$(git rev-parse --abbrev-ref HEAD@{upstream})
REMOTE=${REMOTE_BRANCH/\/$LOCAL_BRANCH/}
CURRENT_BRANCH="${REMOTE}:${LOCAL_BRANCH}"

ORIGIN_URL=$(git remote get-url origin)
ORIGIN_ORG_REPO=$(echo ${ORIGIN_URL} | sed -e 's@.*github\.com.@@' | sed -e 's/\.git//g')
Expand Down Expand Up @@ -73,4 +76,5 @@ gh pr create \
--repo "$ORIGIN_ORG_REPO" \
--base "$TO_BRANCH" \
--body "$BODY" \
--head "$CURRENT_BRANCH"
--head "$CURRENT_BRANCH" \
--web