Merge pull request #5 from sgerrand/alpine-3.8

Build package using Alpine 3.8
sgerrand · Jun 21, 2020 · 8117abd · 8117abd
2 parents 3db0f1c + a56c13b
commit 8117abd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,15 +9,15 @@ jobs:
       - run:
           name: Create Docker volumes
           command: |
-            docker create --name input --volume /home/builder/package alpine:3.7 /bin/true
-            docker create --name output --volume /packages alpine:3.7 /bin/true
-            docker create --name test --volume /home/builder/package --volume /etc/apk/keys --volume /packages alpine:3.7 /bin/true
+            docker create --name input --volume /home/builder/package alpine:3.8 /bin/true
+            docker create --name output --volume /packages alpine:3.8 /bin/true
+            docker create --name test --volume /home/builder/package --volume /etc/apk/keys --volume /packages alpine:3.8 /bin/true
             docker cp ./APKBUILD input:/home/builder/package
       - run:
           name: Build packages
           command: |
             docker run --env RSA_PRIVATE_KEY="$RSA_PRIVATE_KEY" --env RSA_PRIVATE_KEY_NAME="$CIRCLE_PROJECT_USERNAME.rsa" \
-                       --volumes-from input --volumes-from output sgerrand/alpine-abuild:3.7
+                       --volumes-from input --volumes-from output sgerrand/alpine-abuild:3.8
       - run:
           name: Extract packages
           command: |
@@ -31,12 +31,12 @@ jobs:
       - run:
           name: Test installing packages
           command: |
-            docker run --volumes-from test alpine:3.7 \
+            docker run --volumes-from test alpine:3.8 \
               sh -c 'apk add --no-progress --update-cache --upgrade /packages/builder/x86_64/php5-imagick-*.apk'
       - run:
           name: Test PHP module
           command: |
-            docker run --volumes-from test alpine:3.7 \
+            docker run --volumes-from test alpine:3.8 \
               sh -c 'apk add --no-progress --update-cache --upgrade /packages/builder/x86_64/php5-imagick-*.apk \
                 && php5 -r '"'"'$canvas = new Imagick(); $canvas->newImage(350, 70, "white");'"'"''
       - run:

diff --git a/APKBUILD b/APKBUILD
@@ -4,19 +4,19 @@ _php=php5
 pkgname=$_php-imagick
 _pkgrealname=imagick
 pkgver=3.4.3
-pkgrel=0
+pkgrel=1
 _phpver=${pkgname#php}
 _phpver=${_phpver%%-*}
 pkgdesc="PHP$_phpver extension: Provides a wrapper to the ImageMagick library"
-url="http://pecl.php.net/$_pkgrealname"
+url="https://pecl.php.net/$_pkgrealname"
 arch="all"
 license="PHP"
 depends="php$_phpver-common"
 depends_dev="$_php-dev"
 makedepends="$depends_dev autoconf libtool imagemagick-dev pcre-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://pecl.php.net/get/$_pkgrealname-$pkgver.tgz"
+source="https://pecl.php.net/get/$_pkgrealname-$pkgver.tgz"
 
 builddir="$srcdir"/$_pkgrealname-$pkgver