From 9e2b2e3e3265425c04af4da5593352fef107ff5c Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 20 Sep 2019 22:30:17 +0000 Subject: [PATCH 1/8] Windows builds --- .gitlab-ci.yml | 50 ++++++++++---------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb4904611..add8f144d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,54 +1,24 @@ -include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml' - -.cache-paths: &cache-paths - paths: - - _ccache/ +include: 'https://gitlab.gnome.org/bilelmoussaoui/win32-ci-template/raw/master/ci-template.yml' stages: - - test - deploy - - win32_build - - + - win32 variables: - BUNDLE: "dia-dev.flatpak" GIT_SUBMODULE_STRATEGY: recursive -flatpak: - image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master' +win32: variables: - MANIFEST_PATH: "build-aux/flatpak/org.gnome.Dia.json" - FLATPAK_MODULE: "dia" + APP_NAME: "dia" + BIN_NAME: "dia" + MANUFACTURER: "GNOME" MESON_ARGS: "-Dtests=false" - RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" - APP_ID: "org.gnome.Dia" - extends: .flatpak + VERSION: "0.1" + BUNDLE: "dia.msi" + ICON_PATH: "data/icons/scalable/apps/dia.svg" + extends: .win32 review: - dependencies: - - 'flatpak' extends: '.review' stop_review: extends: '.stop_review' - -nightly: - extends: '.publish_nightly' - - -.mingw-defaults: &mingw-defaults - stage: win32_build - tags: - - win32 - script: - - C:\msys64\usr\bin\pacman --noconfirm -Syyuu - - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/msys.sh" - cache: - key: "%CI_JOB_NAME%" - <<: *cache-paths - -msys2-mingw32: - variables: - MSYSTEM: "MINGW32" - CHERE_INVOKING: "yes" - <<: *mingw-defaults -- GitLab From b0bf9c442ee5c4fdce2c855dccd5093fb14a2ca5 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 20 Sep 2019 23:02:54 +0000 Subject: [PATCH 2/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index add8f144d..69de97633 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ win32: VERSION: "0.1" BUNDLE: "dia.msi" ICON_PATH: "data/icons/scalable/apps/dia.svg" + GIT_REPO: "https://gitlab.gnome.org/GNOME/dia.git" extends: .win32 review: -- GitLab From a7c03ada32055832fdffa6693a39bfa5dfc099a9 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 20 Sep 2019 23:30:21 +0000 Subject: [PATCH 3/8] Disable xslt to fix build for now --- plug-ins/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plug-ins/meson.build b/plug-ins/meson.build index 554625d43..56d70c2ea 100644 --- a/plug-ins/meson.build +++ b/plug-ins/meson.build @@ -31,7 +31,7 @@ if host_machine.system() != 'windows' endif subdir('wpg') subdir('xfig') -subdir('xslt') +# subdir('xslt') foreach p : install_plugins_desc message(p.get('name')) -- GitLab From 6e0d2bf63ba7c6eaf1e4d0b05e4c0309f4abf562 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 20 Sep 2019 23:47:14 +0000 Subject: [PATCH 4/8] Use win32 branch --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69de97633..1a4a62dcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ win32: BUNDLE: "dia.msi" ICON_PATH: "data/icons/scalable/apps/dia.svg" GIT_REPO: "https://gitlab.gnome.org/GNOME/dia.git" + GIT_BRANCH: "bilelmoussaoui/win32" extends: .win32 review: -- GitLab From 6387bcf4bb99d379655d74e76a4937abfb002b8d Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 29 Sep 2019 16:25:32 +0000 Subject: [PATCH 5/8] Fix bundle name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a4a62dcd..6a2182e35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ stages: - win32 variables: GIT_SUBMODULE_STRATEGY: recursive + MSI_BUNDLE: "dia.msi" win32: variables: @@ -13,7 +14,6 @@ win32: MANUFACTURER: "GNOME" MESON_ARGS: "-Dtests=false" VERSION: "0.1" - BUNDLE: "dia.msi" ICON_PATH: "data/icons/scalable/apps/dia.svg" GIT_REPO: "https://gitlab.gnome.org/GNOME/dia.git" GIT_BRANCH: "bilelmoussaoui/win32" -- GitLab From 227ff7019136967b4302344d177483dbb067b8c0 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 29 Sep 2019 16:28:33 +0000 Subject: [PATCH 6/8] Make deploy depend on win32 --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a2182e35..9cfa21ffb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,9 @@ include: 'https://gitlab.gnome.org/bilelmoussaoui/win32-ci-template/raw/master/ci-template.yml' stages: - - deploy - win32 + - deploy + variables: GIT_SUBMODULE_STRATEGY: recursive MSI_BUNDLE: "dia.msi" @@ -19,8 +20,8 @@ win32: GIT_BRANCH: "bilelmoussaoui/win32" extends: .win32 -review: - extends: '.review' +win32_review: + extends: '.win32_review' -stop_review: - extends: '.stop_review' +win32_stop_review: + extends: '.win32_stop_review' -- GitLab From 9f16c7973cb41312d8d290e4b4abdf423d4d0131 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 29 Sep 2019 18:36:24 +0000 Subject: [PATCH 7/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cfa21ffb..bbc98412d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,16 +2,15 @@ include: 'https://gitlab.gnome.org/bilelmoussaoui/win32-ci-template/raw/master/c stages: - win32 - - deploy variables: GIT_SUBMODULE_STRATEGY: recursive - MSI_BUNDLE: "dia.msi" win32: variables: APP_NAME: "dia" BIN_NAME: "dia" + MSI_BUNDLE: "dia.msi" MANUFACTURER: "GNOME" MESON_ARGS: "-Dtests=false" VERSION: "0.1" @@ -19,9 +18,3 @@ win32: GIT_REPO: "https://gitlab.gnome.org/GNOME/dia.git" GIT_BRANCH: "bilelmoussaoui/win32" extends: .win32 - -win32_review: - extends: '.win32_review' - -win32_stop_review: - extends: '.win32_stop_review' -- GitLab From 383fc0a3447b76feac96c09bb2f69f2a14a6b570 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 29 Sep 2019 19:24:29 +0000 Subject: [PATCH 8/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbc98412d..ad929dcc1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ variables: win32: variables: APP_NAME: "dia" - BIN_NAME: "dia" MSI_BUNDLE: "dia.msi" MANUFACTURER: "GNOME" MESON_ARGS: "-Dtests=false" -- GitLab