From 4b1e41b237bf171a7f36db727bbfae0392d59161 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Thu, 29 Mar 2018 15:44:50 +0530 Subject: [PATCH 01/10] adding a sample Jenkinsfile to trigger a build --- Jenkinsfile | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..806a2664 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,26 @@ +pipeline { + agent any + + stages { + stage('Prepare') { + steps { + echo 'Preparing the build system environment' + } + } + stage('Build') { + steps { + echo 'Building the package' + } + } + stage('Test') { + steps { + echo 'Testing the package' + } + } + stage('Deploy') { + steps { + echo 'Deploying to repositories..' + } + } + } +} \ No newline at end of file -- 2.17.1 From 0311736ffcf61aebf5557c0408db78ecf9e6b5e9 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 15:25:42 +0530 Subject: [PATCH 02/10] bumped the compatibility version --- .gitlab-ci.yml | 730 ------------------ .../calamares-settings-hamara/debian/compat | 2 +- 2 files changed, 1 insertion(+), 731 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 6cb80ae2..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,730 +0,0 @@ -#/* -# *.gitlab-ci.yml -# * -# * Copyright 2018 Raju Devidas -# * -# * This program is free software; you can redistribute it and/or modify -# * it under the terms of the GNU General Public License as published by -# * the Free Software Foundation; either version 2 of the License, or -# * (at your option) any later version. -# * -# * This program is distributed in the hope that it will be useful, -# * but WITHOUT ANY WARRANTY; without even the implied warranty of -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# * GNU General Public License for more details. -# * -# * You should have received a copy of the GNU General Public License -# * along with this program; if not, write to the Free Software -# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# * MA 02110-1301, USA. -# * -# * -# */ - -# Defines stages each corresponding to a separate hamara-package - -stages: - - build-calamares-settings-hamara-amd64 - - build-calamares-settings-hamara-i386 - - - build-grub-theme-hamara-amd64 - - build-grub-theme-hamara-i386 - - - build-hamara-keyring-2016.5-amd64 - - build-hamara-keyring-2016.5-i386 - - - build-hamara-live-amd64 - - build-hamara-live-i386 - - - build-hamara-sugam-config-amd64 - - build-hamara-sugam-config-i386 - - - build-hamara-wallpapers-amd64 - - build-hamara-wallpapers-i386 - - - build-hamara-welcome-amd64 - - build-hamara-welcome-i386 - - - build-lightdm-webkit-greeter-amd64 - - build-lightdm-webkit-greeter-i386 - - - build-lightdm-webkit-greeter-hamara-amd64 - - build-lightdm-webkit-greeter-hamara-i386 - - - build-materia-gtk-theme-amd64 - - build-materia-gtk-theme-i386 - - - build-paper-icon-theme-amd64 - - build-paper-icon-theme-i386 - - - build-plymouth-theme-hamara-amd64 - - build-plymouth-theme-hamara-i386 - - - build-source-sans-pro-amd64 - - build-source-sans-pro-i386 - -# These steps will run before each build. -# They are included here to avoid repetition of same code on later stages. -# similar to a macro - -before_script: - - export DEBIAN_FRONTEND=noninteractive - - echo "Preparing the container for builds" - - apt update - - apt-get -y upgrade - - apt-get -y dist-upgrade - - apt-get -y install apt-utils figlet dpkg-dev fakeroot git-buildpackage lintian pristine-tar - - figlet BUILD - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-calamares-settings-hamara-amd64: - stage: build-calamares-settings-hamara-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/calamares-settings-hamara/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - #copy the contents of the package to the incoming directory - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-calamares-settings-hamara-i386: - stage: build-calamares-settings-hamara-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/calamares-settings-hamara/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - #copy the contents of the package to the incoming directory - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-grub-theme-hamara-amd64: - stage: build-grub-theme-hamara-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/grub-theme-hamara/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-grub-theme-hamara-i386: - stage: build-grub-theme-hamara-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/grub-theme-hamara/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-hamara-keyring-2016.5-amd64: - stage: build-hamara-keyring-2016.5-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-keyring-2016.5/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-hamara-keyring-2016.5-i386: - stage: build-hamara-keyring-2016.5-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-keyring-2016.5/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-hamara-live-amd64: - stage: build-hamara-live-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-live/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - - -#i386 build -build-hamara-live-i386: - stage: build-hamara-live-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-live/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-hamara-sugam-config-amd64: - stage: build-hamara-sugam-config-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-sugam-config/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-hamara-sugam-config-i386: - stage: build-hamara-sugam-config-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-sugam-config/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - - -#---------------------------------------------------------------------------------------------------------------- - -#amd64 build -build-hamara-wallpapers-amd64: - stage: build-hamara-wallpapers-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-wallpapers/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-hamara-wallpapers-i386: - stage: build-hamara-wallpapers-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-wallpapers/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-hamara-welcome-amd64: - stage: build-hamara-welcome-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-welcome/ - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-hamara-welcome-i386: - stage: build-hamara-welcome-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/hamara-welcome - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-lightdm-webkit-greeter-amd64: - stage: build-lightdm-webkit-greeter-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/lightdm-webkit-greeter - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y install liblightdm-gobject-dev #additional dependency required to build lightdm-webkit-greeter - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-lightdm-webkit-greeter-i386: - stage: build-lightdm-webkit-greeter-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/lightdm-webkit-greeter - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y install liblightdm-gobject-dev #additional dependency required to build lightdm-webkit-greeter - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-lightdm-webkit-greeter-hamara-amd64: - stage: build-lightdm-webkit-greeter-hamara-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/lightdm-webkit-greeter-hamara - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - - -#i386 build -build-lightdm-webkit-greeter-hamara-i386: - stage: build-lightdm-webkit-greeter-hamara-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/lightdm-webkit-greeter-hamara - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - - -#---------------------------------------------------------------------------------------------------------------- - -#amd64 build -build-materia-gtk-theme-amd64: - stage: build-materia-gtk-theme-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/materia-gtk-theme - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-materia-gtk-theme-i386: - stage: build-materia-gtk-theme-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/materia-gtk-theme - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-paper-icon-theme-amd64: - stage: build-paper-icon-theme-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/paper-icon-theme - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - mkdir paper-icon-theme-artifacts - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo paper-icon-theme-artifacts - - artifacts: - paths: - - paper-icon-theme-artifacts/* - untracked: false - expire_in: 1 day - -#i386 build -build-paper-icon-theme-i386: - stage: build-paper-icon-theme-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/paper-icon-theme - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - mkdir paper-icon-theme-artifacts - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo paper-icon-theme-artifacts - - artifacts: - paths: - - paper-icon-theme-artifacts/* - untracked: false - expire_in: 1 day - -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-plymouth-theme-hamara-amd64: - stage: build-plymouth-theme-hamara-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/plymouth-theme-hamara - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - artifacts: - untracked: true - expire_in: 1 day - -#i386 build -build-plymouth-theme-hamara-i386: - stage: build-plymouth-theme-hamara-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/plymouth-theme-hamara - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - artifacts: - untracked: true - expire_in: 1 day -#---------------------------------------------------------------------------------------------------------------- -#amd64 build -build-source-sans-pro-amd64: - stage: build-source-sans-pro-amd64 - image: - name: rajudev/hamara-builder:amd64 - allow_failure: true - dependencies: [] - - script: - - cd packages/source-sans-pro - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day - - -#i386 build -build-source-sans-pro-i386: - stage: build-source-sans-pro-i386 - image: - name: rajudev/hamara-builder:i386 - allow_failure: true - dependencies: [] - - script: - - cd packages/source-sans-pro - - export BUILD_DEPENDS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p' < debian/control` - - apt-get install -y --no-install-recommends $BUILD_DEPENDS - - apt-get -y autoremove --purge - - apt-get clean - - rm -rf /var/lib/apt/lists/* - - dpkg-buildpackage -us -uc - - ls -al / # test the directory structure presence - - echo "Deploying packages to repositories" - - cp ../*.deb ../*.dsc ../*.changes ../*.tar.* ../*.buildinfo /incoming/ - - artifacts: - untracked: true - expire_in: 1 day diff --git a/packages/calamares-settings-hamara/debian/compat b/packages/calamares-settings-hamara/debian/compat index ec635144..f599e28b 100644 --- a/packages/calamares-settings-hamara/debian/compat +++ b/packages/calamares-settings-hamara/debian/compat @@ -1 +1 @@ -9 +10 -- 2.17.1 From 31e812f98805604a734f249c1f8318d4e562b90d Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 15:26:16 +0530 Subject: [PATCH 03/10] changed the standards version and debhelper version --- packages/calamares-settings-hamara/debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/calamares-settings-hamara/debian/control b/packages/calamares-settings-hamara/debian/control index dd68426a..3713aecf 100644 --- a/packages/calamares-settings-hamara/debian/control +++ b/packages/calamares-settings-hamara/debian/control @@ -2,8 +2,8 @@ Source: calamares-settings-hamara Section: utils Priority: optional Maintainer: Raju Devidas -Build-Depends: debhelper (>=9) -Standards-Version: 3.9.8 +Build-Depends: debhelper (>=10) +Standards-Version: 4.1.3 Homepage: https://hamaralinux.org Package: calamares-settings-hamara @@ -17,4 +17,4 @@ Description: Configuration for Calamares installer on Hamara Linux This package is intended for use along with calamares installer on a Hamara Linux live desktop. . This is used on live CD and USB images and is not intended for - installation on normal systems. + installation on normal systems. \ No newline at end of file -- 2.17.1 From d815248842af4df13aa341178f0318df9fa33816 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 15:26:52 +0530 Subject: [PATCH 04/10] added the email to the name --- packages/calamares-settings-hamara/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/calamares-settings-hamara/debian/copyright b/packages/calamares-settings-hamara/debian/copyright index 18fb1892..991fc7e2 100644 --- a/packages/calamares-settings-hamara/debian/copyright +++ b/packages/calamares-settings-hamara/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: calamares-settings-hamara Source: https://git.hamaralinux.org/libregeekingkid/calamares-settings-hamara Files: * -Copyright (C) 2017 Raju Devidas +Copyright (C) 2017 Raju Devidas This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- 2.17.1 From 05a3abc3ca37208f2432a542c4c36009976aab4a Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 15:27:21 +0530 Subject: [PATCH 05/10] modified the comment in the desktop file --- .../calamares-settings-hamara/install-hamara-desktop.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/calamares-settings-hamara/install-hamara-desktop.desktop b/packages/calamares-settings-hamara/install-hamara-desktop.desktop index a66d2123..7e6515e9 100644 --- a/packages/calamares-settings-hamara/install-hamara-desktop.desktop +++ b/packages/calamares-settings-hamara/install-hamara-desktop.desktop @@ -4,7 +4,7 @@ Version=1.0 Name=Install Hamara Sugam GenericName=System Installer Exec=sudo /usr/bin/calamares -Comment=Calamares — Hamara Sugam Desktop Installer +Comment=Calamares— Hamara Sugam Desktop Installer Icon=install-hamara-linux Terminal=false Categories=Qt; -- 2.17.1 From bea008ff1fe280697a355dcb5b5d9724de21cdcc Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 15:33:44 +0530 Subject: [PATCH 06/10] adding a newer compat version --- packages/grub-theme-hamara/debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grub-theme-hamara/debian/compat b/packages/grub-theme-hamara/debian/compat index ec635144..f599e28b 100644 --- a/packages/grub-theme-hamara/debian/compat +++ b/packages/grub-theme-hamara/debian/compat @@ -1 +1 @@ -9 +10 -- 2.17.1 From 782199bfd787eee49bb5761fc6f5a18437347a07 Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 15:43:20 +0530 Subject: [PATCH 07/10] changed the sources to point to buster repos instead of stretch --- .../calamares-settings-hamara/calamares/scripts/sources-final | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/calamares-settings-hamara/calamares/scripts/sources-final b/packages/calamares-settings-hamara/calamares/scripts/sources-final index dcf59100..f651f1b0 100755 --- a/packages/calamares-settings-hamara/calamares/scripts/sources-final +++ b/packages/calamares-settings-hamara/calamares/scripts/sources-final @@ -7,6 +7,6 @@ cat < $CHROOT/etc/apt/sources.list deb http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free deb-src http://in.devel.hamaralinux.org/hamara-sugam namaste main contrib non-free # Debian Security Mirror -deb http://security.debian.org/debian-security stretch/updates main -deb-src http://security.debian.org/debian-security stretch/updates main +deb http://security.debian.org/debian-security buster/updates main +deb-src http://security.debian.org/debian-security buster/updates main EOF -- 2.17.1 From 4cfacc77491fe714fb557d77b0f90031d540d27b Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 16:08:45 +0530 Subject: [PATCH 08/10] changing executable mode of the desktop file --- packages/hamara-live/debian/postinst | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hamara-live/debian/postinst b/packages/hamara-live/debian/postinst index 39cfa16c..f40c6ea6 100644 --- a/packages/hamara-live/debian/postinst +++ b/packages/hamara-live/debian/postinst @@ -12,4 +12,5 @@ if [ -e /usr/share/applications/install-hamara-desktop.desktop ];then mkdir -p $DEST_DIR cp /usr/share/applications/install-hamara-desktop.desktop $DEST_DIR chown -R 1000:1000 $DEST_DIR + chmod +x $DEST_DIR/install-hamara-desktop.desktop fi -- 2.17.1 From 4bfc9426c059fc4df893c2760f27b3702bb8350e Mon Sep 17 00:00:00 2001 From: Raju Vindane Date: Tue, 10 Apr 2018 16:10:43 +0530 Subject: [PATCH 09/10] small version number change [ci-skip][ci skip][skip ci] --- packages/calamares-settings-hamara/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/calamares-settings-hamara/debian/changelog b/packages/calamares-settings-hamara/debian/changelog index f918e733..8b069621 100644 --- a/packages/calamares-settings-hamara/debian/changelog +++ b/packages/calamares-settings-hamara/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-hamara (201710) namaste; urgency=medium + + * Updates to the repo URLs in package to point to buster security repos + + -- Raju Devidas Tue, 10 Apr 2018 15:44:24 +0530 + calamares-settings-hamara (201710) namaste; urgency=medium * Added slideshows to Calamares Installer -- 2.17.1 From c1e02fa198e7fe4c2d19b5c91488942d2d84abe3 Mon Sep 17 00:00:00 2001 From: "Dhanesh B. Sabane" Date: Fri, 18 May 2018 18:14:24 +0530 Subject: [PATCH 10/10] Replace the logo with a well-padded SVG logo and change sidebar colours - The Calamares Installer now follows the Hamara style guide for the colours on the sidebar --- .../calamares/branding/hamara/branding.desc | 8 +- .../branding/hamara/emblem-hamara.svg | 92 ++++++++++++++++++ .../calamares/branding/hamara/hamara-logo.png | Bin 2761 -> 0 bytes 3 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 packages/calamares-settings-hamara/calamares/branding/hamara/emblem-hamara.svg delete mode 100644 packages/calamares-settings-hamara/calamares/branding/hamara/hamara-logo.png diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc index dc6d0cf3..25073d4a 100644 --- a/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc +++ b/packages/calamares-settings-hamara/calamares/branding/hamara/branding.desc @@ -14,13 +14,13 @@ strings: releaseNotesUrl: https://www.hamaralinux.org/beta-release-of-hamara-sugam-2-0/ images: - productLogo: "hamara-logo.png" - productIcon: "hamara-logo.png" + productLogo: "emblem-hamara.svg" + productIcon: "emblem-hamara.svg" productWelcome: "welcome.png" slideshow: "show.qml" style: - sidebarBackground: "#2c3133" + sidebarBackground: "#282828" sidebarText: "#FFFFFF" - sidebarTextSelect: "#4d7079" + sidebarTextSelect: "#282828" diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/emblem-hamara.svg b/packages/calamares-settings-hamara/calamares/branding/hamara/emblem-hamara.svg new file mode 100644 index 00000000..a429fb9d --- /dev/null +++ b/packages/calamares-settings-hamara/calamares/branding/hamara/emblem-hamara.svg @@ -0,0 +1,92 @@ + + + + + + + image/svg+xml + + favi icon + + + + + favi icon + + + + + + + + + + + diff --git a/packages/calamares-settings-hamara/calamares/branding/hamara/hamara-logo.png b/packages/calamares-settings-hamara/calamares/branding/hamara/hamara-logo.png deleted file mode 100644 index 029b12fdde059764854083b29d531263b72deca4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2761 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 -- 2.17.1