From f4c693ce131383adb627d82fdf58e1901d3117b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 30 Nov 2021 21:53:30 +0100 Subject: [PATCH 1/4] Fix DOCKER_TEST_PREFIX in test_dist_linux_on_docker --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf5946438416..444d737fd161 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -432,7 +432,7 @@ jobs: cd /tmp/workspace/distribution-scripts source ./build.env gunzip -c /tmp/workspace/build/docker-${CRYSTAL_VERSION}-ubuntu-x86_64.tar.gz | docker image load - export DOCKER_TEST_PREFIX="crystallang/crystal:$DOCKER_TAG" >> $BASH_ENV + echo 'export DOCKER_TEST_PREFIX="crystallang/crystal:$DOCKER_TAG"' >> $BASH_ENV - checkout - run: bin/ci prepare_system - run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV From d407be3243ea22365aa6a02dff2efc970dd08d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 30 Nov 2021 21:53:47 +0100 Subject: [PATCH 2/4] Fix publish_docker depends on test_dist_linux_on_docker --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 444d737fd161..d94ce9e83e1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -504,7 +504,7 @@ workflows: - publish_docker: filters: *release requires: - - dist_docker + - test_dist_linux_on_docker - dist_docs: filters: *release requires: From 663634635f3e09b9e8a99fe85d88aa16dcbcbdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 30 Nov 2021 23:28:19 +0100 Subject: [PATCH 3/4] fixup --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d94ce9e83e1b..bb913a68e7be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -432,7 +432,7 @@ jobs: cd /tmp/workspace/distribution-scripts source ./build.env gunzip -c /tmp/workspace/build/docker-${CRYSTAL_VERSION}-ubuntu-x86_64.tar.gz | docker image load - echo 'export DOCKER_TEST_PREFIX="crystallang/crystal:$DOCKER_TAG"' >> $BASH_ENV + echo "export DOCKER_TEST_PREFIX=crystallang/crystal:${DOCKER_TAG}" >> $BASH_ENV - checkout - run: bin/ci prepare_system - run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV From ee9113f77be85c279c3d468138de29b67593e004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 1 Dec 2021 12:41:02 +0100 Subject: [PATCH 4/4] Fix loading build docker image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb913a68e7be..29ea7e72bf67 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -431,7 +431,7 @@ jobs: - run: | cd /tmp/workspace/distribution-scripts source ./build.env - gunzip -c /tmp/workspace/build/docker-${CRYSTAL_VERSION}-ubuntu-x86_64.tar.gz | docker image load + gunzip -c /tmp/workspace/build/docker-${CRYSTAL_VERSION}-ubuntu-x86_64-build.tar.gz | docker image load echo "export DOCKER_TEST_PREFIX=crystallang/crystal:${DOCKER_TAG}" >> $BASH_ENV - checkout - run: bin/ci prepare_system