From 4612660168060bd1c12233b15ee084f1aafa537b Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Wed, 15 Jul 2020 13:55:10 +0200 Subject: [PATCH 1/2] Upgrade to Mender 2.3.0 and mender-artifact 3.4.0. Changelog: Title Signed-off-by: Kristian Amlie --- .gitlab-ci.yml | 4 ++-- Dockerfile | 2 +- configs/mender_convert_config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdd1e5a..8064b6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ variables: S3_BUCKET_NAME: mender-convert-images # These variables are present elsewhere in the repository too. Make sure to # search for and change them too. - MENDER_ARTIFACT_VERSION: 3.4.0b1 - MENDER_CLIENT_VERSION: 2.3.0b1 + MENDER_ARTIFACT_VERSION: 3.4.0 + MENDER_CLIENT_VERSION: 2.3.0 # Make sure to update the link in mender-docs to the new one when changing # this. RASPBIAN_URL: http://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2020-05-28/2020-05-27-raspios-buster-lite-armhf.zip diff --git a/Dockerfile b/Dockerfile index caae031..df6a8c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN cd /root/pxz && make FROM ubuntu:20.04 -ARG MENDER_ARTIFACT_VERSION=3.4.0b1 +ARG MENDER_ARTIFACT_VERSION=3.4.0 RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ # For 'ar' command to unpack .deb diff --git a/configs/mender_convert_config b/configs/mender_convert_config index 4cad066..68000aa 100644 --- a/configs/mender_convert_config +++ b/configs/mender_convert_config @@ -98,7 +98,7 @@ MENDER_PARTITION_ALIGNMENT="8388608" # Mender client version # # This is used to fetch the correct binaries -MENDER_CLIENT_VERSION="2.3.0b1" +MENDER_CLIENT_VERSION="2.3.0" # File storage, containing binary files, do not modify this unless you know # what you are doing. From 9278d5977eee82f67208e60d039735f8e0325c0d Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Wed, 15 Jul 2020 14:00:09 +0200 Subject: [PATCH 2/2] Enable image upload from pull requests as well. No need to restrict the job, since it is manual anyway. Changelog: None Signed-off-by: Kristian Amlie --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8064b6a..bc236ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -207,6 +207,3 @@ publish:s3: - aws s3api put-object-acl --acl public-read --bucket $S3_BUCKET_NAME --key ${RASPBIAN_NAME}/arm/${PUBLISH_NAME} - done - - only: - - /^(master|[0-9]+\.[0-9]+\.x)$/