Skip to content

Commit

Permalink
The wine-mono group was renamed to mono.
Browse files Browse the repository at this point in the history
  • Loading branch information
madewokherd committed Sep 5, 2024
1 parent 19eea22 commit 2519fa0
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SOURCE CODE

To obtain the source code, clone it from gitlab:

$ git clone --recursive https://gitlab.winehq.org/wine-mono/wine-mono.git
$ git clone --recursive https://gitlab.winehq.org/mono/wine-mono.git

To get to the source code for a specific release, check out the appropriate tag, and update the submodules:

Expand Down Expand Up @@ -68,14 +68,14 @@ Bugs should be filed in the Wine bugzilla (http://bugs.winehq.org/) with product

PATCHES

Patches to the top-level project should be sent as a merge request to https://gitlab.winehq.org/wine-mono/wine-mono.
Patches to the top-level project should be sent as a merge request to https://gitlab.winehq.org/mono/wine-mono.

Patches to Mono should be sent as a merge request to https://gitlab.winehq.org/wine-mono/mono. Ideally, most MRs should be for the main branch, which does not contain Wine Mono's modifications. If the change is specific to Wine Wono, then the MR should be for the wine-mono branch.
Patches to Mono should be sent as a merge request to https://gitlab.winehq.org/mono/mono. Ideally, most MRs should be for the main branch, which does not contain Wine Mono's modifications. If the change is specific to Wine Wono, then the MR should be for the wine-mono branch.

Changes to upstream projects that make sense only within the context of wine-mono and not for the project's general use case should be sent as a merge request to the appropriate fork in https://gitlab.winehq.org/wine-mono, on the wine-mono branch.
Changes to upstream projects that make sense only within the context of wine-mono and not for the project's general use case should be sent as a merge request to the appropriate fork in https://gitlab.winehq.org/mono, on the wine-mono branch.

FNA and related projects have been very responsive to pull requests, and it's worth sending changes upstream to https://github.com/FNA-XNA/FNA.

Changes to mono-basic should be sent as a merge request to https://gitlab.winehq.org/wine-mono/mono-basic. However, before doing any substantial work on mono-basic, it may be worth checking whether there's an implementation in https://github.com/dotnet/winforms or https://github.com/dotnet/runtime.
Changes to mono-basic should be sent as a merge request to https://gitlab.winehq.org/mono/mono-basic. However, before doing any substantial work on mono-basic, it may be worth checking whether there's an implementation in https://github.com/dotnet/winforms or https://github.com/dotnet/runtime.

The winforms and wpf projects are not being updated from upstream, and have diverged significantly. Since they are supporting .NET Core, which adds new features and is not binary-compatible with .NET Framework, their use case is very different from ours. Any changes should be sent directly to the appropriate fork, but feel free to also send them upstream if it makes sense.
4 changes: 2 additions & 2 deletions tools/ci/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

build:
stage: build
image: $CI_REGISTRY/wine-mono/wine-mono:debian-bookworm-build
image: $CI_REGISTRY/mono/wine-mono:debian-bookworm-build
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_PROJECT_NAMESPACE == 'wine-mono'
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_PROJECT_NAMESPACE == 'mono'
interruptible: true
cache:
-
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/image.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
build-image-build:
stage: image
rules:
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine-mono/wine-mono" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "mono/wine-mono" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
changes:
- tools/ci/image.yml
- tools/ci/build.docker
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ linux-test:
stage: test
image: $CI_REGISTRY/wine/wine:debian-bookworm
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_PROJECT_NAMESPACE == 'wine-mono'
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_PROJECT_NAMESPACE == 'mono'
interruptible: true
cache:
- key: wine-addons
Expand Down
6 changes: 3 additions & 3 deletions tools/ci/update-submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ recursiveupdate ()
fi

if ! test -e "$fullpath"/.git; then
# Try the wine-mono organization
git clone https://gitlab.winehq.org/wine-mono/"$urlbase" "$fullpath"
# Try the mono organization
git clone https://gitlab.winehq.org/mono/"$urlbase" "$fullpath"
fi

if test ! -e "$fullpath"/.git -a x != x$CI_MERGE_REQUEST_SOURCE_PROJECT_URL; then
Expand All @@ -65,7 +65,7 @@ recursiveupdate ()
if test x"$(git rev-parse HEAD)" != x"$commit"; then
git fetch origin "$commit" ||
git fetch "$url" "$commit" ||
git fetch https://gitlab.winehq.org/wine-mono/"$urlbase" "$commit" ||
git fetch https://gitlab.winehq.org/mono/"$urlbase" "$commit" ||
git fetch "$(dirname "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL")"/"$urlbase" "$commit" ||
(echo Unable to fetch commit "$commit" in "$fullpath"; exit 1)
git checkout -f $commit || exit 1
Expand Down

0 comments on commit 2519fa0

Please sign in to comment.