Verified Commit 68d6eb52 authored by noplanman's avatar noplanman

Shift default version to 1.1.8

parent fb4b20fe
......@@ -10,6 +10,10 @@ armv5:
extends: .main
variables: {ARCH: armel, NAME: "borg-${CI_COMMIT_TAG}-armv5"}
armv6:
extends: .main
variables: {ARCH: rpi, NAME: "borg-${CI_COMMIT_TAG}-armv6"}
armv7:
extends: .main
variables: {ARCH: armv7hf, NAME: "borg-${CI_COMMIT_TAG}-armv7"}
......@@ -17,10 +21,6 @@ armv7:
arm64:
extends: .main
variables: {ARCH: aarch64, NAME: "borg-${CI_COMMIT_TAG}-arm64"}
armv6:
extends: .main
variables: {ARCH: rpi, NAME: "borg-${CI_COMMIT_TAG}-armv6"}
.main:
stage: build
......@@ -42,6 +42,6 @@ deploy artifacts to bintray:
- ci/bintray.sh
dependencies:
- armv5
- armv6
- armv7
- arm64
- armv6
......@@ -2,7 +2,7 @@ ARG BORG_ARCH
FROM resin/${BORG_ARCH}-python:3.6-slim
ARG BORG_ARCH
ARG BORG_VERSION=1.1.7
ARG BORG_VERSION=1.1.8
ENV BORG_DIR /borg
ENV BORG_BUILD_DIR ${BORG_DIR}/dist
......
......@@ -2,7 +2,7 @@ ARG BORG_ARCH
FROM noplanman/borg-binary-builder:base-1.1.0-${BORG_ARCH}
ARG BORG_ARCH
ARG BORG_VERSION=1.1.7
ARG BORG_VERSION=1.1.8
ENV BORG_DIR /borg
ENV BORG_BUILD_DIR ${BORG_DIR}/dist
......
......@@ -11,8 +11,8 @@ Build [BorgBackup] binaries on any platform, for any architecture, using docker.
See the [list of available architectures] ([on GitHub][available-architectures-github])
*Examples:*
- Build version `1.1.7` for `aarch64`
`./build.sh aarch64 1.1.7`
- Build version `1.1.8` for `aarch64`
`./build.sh aarch64 1.1.8`
- Build version `1.1.5` for Raspberry Pi 3
`./build.sh raspberrypi3 1.1.5`
......@@ -24,8 +24,8 @@ See the [list of available architectures] ([on GitHub][available-architectures-g
**Note:** This will overwrite the file at `binary_save_location` if it already exists!
*Examples:*
- Extract borg `1.1.7` binary for `aarch64` to `borg-aarch64` in current folder
`./extract.sh aarch64 1.1.7 borg-aarch64`
- Extract borg `1.1.8` binary for `aarch64` to `borg-aarch64` in current folder
`./extract.sh aarch64 1.1.8 borg-aarch64`
- Extract borg `1.1.5` binary for Raspberry Pi 3 to `/homes/lemoi/borg`
`./extract.sh raspberrypi3 1.1.5 /homes/lemoi/borg`
......
......@@ -6,7 +6,7 @@
# https://docs.resin.io/reference/base-images/base-images/
BORG_ARCH=${1}
BORG_VERSION=${2:-1.1.7}
BORG_VERSION=${2:-1.1.8}
if [ -z "${BORG_ARCH}" ]; then
echo "Usage: ./build.sh <arch> [<version>]";
......
......@@ -3,7 +3,7 @@
# Usage: ./extract.sh <arch> [<version>] [<binary_save_location>]
BORG_ARCH=${1}
BORG_VERSION=${2:-1.1.7}
BORG_VERSION=${2:-1.1.8}
BORG_BINARY=${3:-borg-${BORG_VERSION}-${BORG_ARCH}}
DOCKER_IMAGE=borg:${BORG_VERSION}-${BORG_ARCH}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment