commit 28b095a5af0c58691a78b22fb2e7fe901a846d66 Author: Deon George Date: Tue Jan 29 11:15:59 2019 +1100 Initial Revision diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..fbfe97d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,84 @@ +stages: + - build + - deploy + +variables: + VERSION: "3.4.9" + +before_script: + - env|sort + - pwd + +build:x86_64: + image: ${CI_REGISTRY}/leenooks/ci-apt:x86_64 + stage: build + script: + - apt-get update + - apt-get install -y cmake + - git clone git://git.code.sf.net/p/makenl/code makenl + - cd makenl + - git checkout debian + - git merge master --no-edit + - git am ../0001-Updated-to-3.4.9.patch + - dpkg-buildpackage -us -uc + - cd .. + - mkdir build + - ls -al ./ + - mv ./${CI_PROJECT_NAME}*.deb ./build/ + tags: + - apt + - x86_64 + only: + - master + artifacts: + paths: + - build/*deb + expire_in: 1 week + +deploy:x86_64: + stage: deploy + dependencies: + - build:x86_64 + only: + - master + script: + - reprepro -b /apt includedeb $(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) build/${CI_PROJECT_NAME}_${VERSION}*.deb + tags: + - reprepro + +build:armv7l: + image: ${CI_REGISTRY}/leenooks/ci-apt:armv7l + stage: build + script: + - apt-get update + - apt-get install -y cmake + - git clone git://git.code.sf.net/p/makenl/code makenl + - cd makenl + - git checkout debian + - git merge master --no-edit + - git am ../0001-Updated-to-3.4.9.patch + - dpkg-buildpackage -us -uc + - cd .. + - mkdir build + - ls -al ./ + - mv ./${CI_PROJECT_NAME}*.deb ./build/ + tags: + - apt + - armv7l + only: + - master + artifacts: + paths: + - build/*deb + expire_in: 1 week + +deploy:armv7l: + stage: deploy + dependencies: + - build:armv7l + only: + - master + script: + - reprepro -b /apt includedeb $(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) build/${CI_PROJECT_NAME}_${VERSION}*.deb + tags: + - reprepro diff --git a/0001-Updated-to-3.4.9.patch b/0001-Updated-to-3.4.9.patch new file mode 100644 index 0000000..75a77fe --- /dev/null +++ b/0001-Updated-to-3.4.9.patch @@ -0,0 +1,27 @@ +From 29ab248dd545a59c29347b4df97d174624c22a89 Mon Sep 17 00:00:00 2001 +From: Deon George +Date: Mon, 28 Jan 2019 12:51:58 +0000 +Subject: [PATCH] Updated to 3.4.9 + +--- + debian/changelog | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/debian/changelog b/debian/changelog +index 7b3c09a..09362e8 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,10 @@ ++makenl (3.4.9-1) stable; urgency=medium ++ ++ * Non-maintainer upload. ++ * New upstream release. ++ ++ -- Deon George Mon, 28 Jan 2019 00:00:00 +1100 ++ + makenl (3.4.8-1) stable; urgency=medium + + * New upstream release. +-- +2.11.0 +