[gimp-macos-build] rename fork-test to gimp
- From: Alex Samorukov <asamorukov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-macos-build] rename fork-test to gimp
- Date: Wed, 6 Nov 2019 09:49:28 +0000 (UTC)
commit 1bde98a3ec90177f61f838c92c8faee5354bc81d
Author: Oleksii Samorukov <oleksii_samorukov mckinsey com>
Date: Wed Nov 6 10:49:27 2019 +0100
rename fork-test to gimp
.circleci/config.yml | 2 +-
README.md | 7 ++++---
jhbuildrc-gtk-osx-gimp | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4c6736..7fae333 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
command: |
cd $HOME
mkdir -p ~/.config && mv ~/project/jhbuildrc-gtk-osx-gimp ~/.config/jhbuildrc-custom
- curl https://gitlab.gnome.org/samm-git/gtk-osx/raw/fork-test/gtk-osx-setup.sh >
gtk-osx-setup.sh
+ curl https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/gtk-osx-setup.sh > gtk-osx-setup.sh
chmod +x gtk-osx-setup.sh
echo 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH:$HOME/.new_local/bin"' >> ~/.profile
echo 'export ARCHFLAGS="-arch x86_64"' >> ~/.profile
diff --git a/README.md b/README.md
index c6af7f7..c1df274 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,10 @@ This repository contains files related to GIMP/OSX build using CircleCI.
## Build process description
-To build GIMP/MacOS we are using [fork](https://gitlab.gnome.org/samm-git/gtk-osx/tree/fork-test)
-of the [gtk-osx](https://gitlab.gnome.org/GNOME/gtk-osx) project. Fork adds modules related to GIMP
-and some gimp-specific patches to GTK. Currently build is done using CircleCI.
+To build GIMP/MacOS we are using [fork](https://gitlab.gnome.org/samm-git/gtk-osx/tree/gimp)
+of the [gtk-osx](https://gitlab.gnome.org/GNOME/gtk-osx) project (`gimp` branch).
+Fork adds modules related to GIMP and some gimp-specific patches to GTK.
+Currently build is done using CircleCI.
Because CircleCI is not supporting gitlab [yet] there is a [GitHub
mirror](https://github.com/GNOME/gimp-macos-build) of this repository.
diff --git a/jhbuildrc-gtk-osx-gimp b/jhbuildrc-gtk-osx-gimp
index 12744ef..9999ab0 100644
--- a/jhbuildrc-gtk-osx-gimp
+++ b/jhbuildrc-gtk-osx-gimp
@@ -155,7 +155,7 @@ environ_prepend('OBJCFLAGS', "-O3")
# os.environ["CC"] = "/usr/bin/gcc-4.0"
# use our modulset
-moduleset = 'https://gitlab.gnome.org/samm-git/gtk-osx/raw/fork-test/modulesets-stable/gtk-osx.modules'
+moduleset = 'https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/modulesets-stable/gtk-osx.modules'
# force python 3.6 for the libxml2 to avoid build issues
module_extra_env['libxml2'] = { "ac_cv_path_PYTHON": "python3.6" }
@@ -181,7 +181,7 @@ class _cmd_bootstrap_gtk_osx_gimp(jhbuild.commands.base.cmd_build):
moduleset + '.modules'))):
config.moduleset = moduleset
else:
- config.moduleset =
'https://gitlab.gnome.org/samm-git/gtk-osx/raw/fork-test/modulesets-stable/bootstrap.modules'
+ config.moduleset =
'https://gitlab.gnome.org/samm-git/gtk-osx/raw/gimp/modulesets-stable/bootstrap.modules'
args = ['meta-bootstrap']
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]