From b41560f4e1abc50cae913e6bcc11cbb9063f3297 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 5 Jul 2019 08:51:45 +0200 Subject: [PATCH] Set cache by kernel version for CircleCI --- .circleci/config.yml | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e9a261eb..f6452c6bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: x86_64 + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -27,8 +28,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -78,6 +79,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: x86 + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -85,8 +87,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -135,6 +137,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: rpi3 + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -142,8 +145,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -192,6 +195,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: rpi4 + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -199,8 +203,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -249,6 +253,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: rpi2 + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -256,8 +261,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -306,6 +311,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: bpi-r2 + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -313,8 +319,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -365,6 +371,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG - OMR_TARGET: wrt3200acm + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -372,8 +379,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -422,6 +429,7 @@ jobs: environment: - OMR_VERSION: $CIRCLE_TAG + - OMR_KERNEL: ${OMR_KERNEL:4.14} working_directory: ~/ @@ -429,8 +437,8 @@ jobs: - run: name: cache command: | - echo "cache 53 $OMR_TARGET" > /tmp/cache-target - echo "cache 57 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 53 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target + echo "cache 57 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: