From 3a2d806f3271e288657473f728010e7c21f06c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 4 May 2021 19:28:42 +0200
Subject: [PATCH 01/20] =?UTF-8?q?[CI=C2=9D]=20Add=20OBS=20nightly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 734fa8b12135..be1fc61ebc5a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ jobs:
       - run: |
           git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
           cd ~/distribution-scripts
-          git checkout e5f21df883d800e9e68f63b79cf796696f905cf1
+          git checkout c2518d8bbb8bf8f76c0b1600a19d9d9f50b5774d
       # persist relevant information for build process
       - run: |
           cd ~/distribution-scripts
@@ -335,7 +335,7 @@ jobs:
           paths:
             - build
 
-  dist_bintray_nightly:
+  dist_obs_nightly:
     machine: true
     steps:
       - attach_workspace:
@@ -345,13 +345,12 @@ jobs:
           command: |
             cd /tmp/workspace/distribution-scripts
             source build.env
-            cd bintray
-            ./publish-nightly.sh $CRYSTAL_VERSION $(date '+%Y-%m-%d') \
-                /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
-                /tmp/workspace/build/crystal-*-linux-i686.tar.gz
-      - store_artifacts:
-          path: /tmp/workspace/distribution-scripts/bintray/build/unsigned
-          destination: unsigned
+
+            packages/obs-setup.sh
+            packages/obs-push.sh home:straight-shoota:Crystal:nightly $CRYSTAL_VERSION $(date '+%Y%m%d') $CRYSTAL_SHA \
+                /tmp/workspace/build/crystal-$CRYSTAL_VERSION-linux-x86_64.tar.gz \
+                /tmp/workspace/build/crystal-$CRYSTAL_VERSION-linux-i686.tar.gz \
+                /tmp/workspace/build/crystal-$CRYSTAL_VERSION-docs.tar.gz
 
   dist_docker:
     machine: true
@@ -613,10 +612,11 @@ workflows:
       - dist_darwin:
           requires:
             - prepare_nightly
-      - dist_bintray_nightly:
+      - dist_obs_nightly:
           requires:
             - dist_linux
             - dist_linux32
+            - dist_docs
       - dist_docker:
           requires:
             - dist_linux

From ce0eb8f53ec620454c6f63e139cbc32f4035547d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 4 May 2021 19:29:10 +0200
Subject: [PATCH 02/20] [CI] Temporarily enable dist_obs_nightly for
 maintenance release

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be1fc61ebc5a..9d6a91402b5f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -723,6 +723,11 @@ workflows:
             - dist_darwin
             - dist_snap
             - dist_docs
+      - dist_obs_nightly:
+          requires:
+            - dist_linux
+            - dist_linux32
+            - dist_docs
 
   package_build:
     jobs:

From 3698fef9c9ea6f2696bbe42e7bd45286112fc94d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 4 May 2021 21:25:33 +0200
Subject: [PATCH 03/20] update

---
 .circleci/config.yml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d6a91402b5f..911133faf030 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ jobs:
       - run: |
           git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
           cd ~/distribution-scripts
-          git checkout c2518d8bbb8bf8f76c0b1600a19d9d9f50b5774d
+          git checkout 8cb711986432b0d13ed0eb12229d5d4ef1cc0be3
       # persist relevant information for build process
       - run: |
           cd ~/distribution-scripts
@@ -336,7 +336,8 @@ jobs:
             - build
 
   dist_obs_nightly:
-    machine: true
+    docker:
+      - image: straightshoota/osc
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -347,10 +348,10 @@ jobs:
             source build.env
 
             packages/obs-setup.sh
-            packages/obs-push.sh home:straight-shoota:Crystal:nightly $CRYSTAL_VERSION $(date '+%Y%m%d') $CRYSTAL_SHA \
-                /tmp/workspace/build/crystal-$CRYSTAL_VERSION-linux-x86_64.tar.gz \
-                /tmp/workspace/build/crystal-$CRYSTAL_VERSION-linux-i686.tar.gz \
-                /tmp/workspace/build/crystal-$CRYSTAL_VERSION-docs.tar.gz
+            packages/obs-push.sh home:straight-shoota:Crystal:nightly $CRYSTAL_VERSION $(date '+%Y%m%d') $CRYSTAL_SHA1 \
+                /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
+                /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
+                /tmp/workspace/build/crystal-*-docs.tar.gz
 
   dist_docker:
     machine: true
@@ -586,13 +587,6 @@ workflows:
             - dist_docs
 
   nightly_release:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - master
     jobs:
       - test_linux
       - test_linux32_std
@@ -723,11 +717,6 @@ workflows:
             - dist_darwin
             - dist_snap
             - dist_docs
-      - dist_obs_nightly:
-          requires:
-            - dist_linux
-            - dist_linux32
-            - dist_docs
 
   package_build:
     jobs:

From 4c58336d701e39d3604658303331272a0a004061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 4 May 2021 23:15:00 +0200
Subject: [PATCH 04/20] Add PAGER=cat

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 911133faf030..33712798cc12 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -346,6 +346,9 @@ jobs:
           command: |
             cd /tmp/workspace/distribution-scripts
             source build.env
+            # osc may try to use a pager, even if stdout is not a TTY,
+            # cat avoids stalling on that.
+            export PAGER=cat
 
             packages/obs-setup.sh
             packages/obs-push.sh home:straight-shoota:Crystal:nightly $CRYSTAL_VERSION $(date '+%Y%m%d') $CRYSTAL_SHA1 \

From f0b2c849303595c69920b78f911cc46cf2fb529d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 4 May 2021 23:21:19 +0200
Subject: [PATCH 05/20] Remove no output timeout

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33712798cc12..4ea64af34837 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -342,7 +342,6 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - run:
-          no_output_timeout: 20m
           command: |
             cd /tmp/workspace/distribution-scripts
             source build.env

From 20ccf008b094f4ba9f24002353817996587e3538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 5 May 2021 00:07:38 +0200
Subject: [PATCH 06/20] Strip -dev suffix from crystal version

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ea64af34837..ad0dc5f1cee6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -350,7 +350,7 @@ jobs:
             export PAGER=cat
 
             packages/obs-setup.sh
-            packages/obs-push.sh home:straight-shoota:Crystal:nightly $CRYSTAL_VERSION $(date '+%Y%m%d') $CRYSTAL_SHA1 \
+            packages/obs-push.sh home:straight-shoota:Crystal:nightly ${CRYSTAL_VERSION%-*} $(date '+%Y%m%d') $CRYSTAL_SHA1 \
                 /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz

From d87a115ff1d71664f3438c818e5d0a38696046f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 5 May 2021 14:07:23 +0200
Subject: [PATCH 07/20] Update distribution-scripts

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad0dc5f1cee6..2a4eec447235 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ jobs:
       - run: |
           git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
           cd ~/distribution-scripts
-          git checkout 8cb711986432b0d13ed0eb12229d5d4ef1cc0be3
+          git checkout 6a6d063916206848775f31d6090533d3ca47bc38
       # persist relevant information for build process
       - run: |
           cd ~/distribution-scripts

From 27fe0136600479429a79de34ad12d8264bc61284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 5 May 2021 18:25:11 +0200
Subject: [PATCH 08/20] Switch to OBS production project

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a4eec447235..be3c23ef3004 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -350,7 +350,7 @@ jobs:
             export PAGER=cat
 
             packages/obs-setup.sh
-            packages/obs-push.sh home:straight-shoota:Crystal:nightly ${CRYSTAL_VERSION%-*} $(date '+%Y%m%d') $CRYSTAL_SHA1 \
+            packages/obs-push.sh devel:languages:crystal:nightly ${CRYSTAL_VERSION%-*} $(date '+%Y%m%d') $CRYSTAL_SHA1 \
                 /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz

From 9e421a9d0ba3ac4dc18e5921c8841e75e473c586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 5 May 2021 22:42:17 +0200
Subject: [PATCH 09/20] Update distribution scripts

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be3c23ef3004..a4bd8f913b94 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ jobs:
       - run: |
           git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
           cd ~/distribution-scripts
-          git checkout 6a6d063916206848775f31d6090533d3ca47bc38
+          git checkout 8307d8d2e8fea4c8dd64ff15877fe0c3027e0d80
       # persist relevant information for build process
       - run: |
           cd ~/distribution-scripts

From 3bf74be3de443a6628e1f88c8b26d76e261adc22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 5 May 2021 22:42:45 +0200
Subject: [PATCH 10/20] Re-enable nightly workflow

---
 .circleci/config.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4bd8f913b94..18460aa1f505 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -589,6 +589,13 @@ workflows:
             - dist_docs
 
   nightly_release:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
     jobs:
       - test_linux
       - test_linux32_std

From 28bd43dcd3e56b05ceabc2e73fe452e5a7cdcd8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 6 May 2021 13:44:44 +0200
Subject: [PATCH 11/20] Add dist_obs_maintenance

---
 .circleci/config.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18460aa1f505..e65b7da2a06e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,6 +230,10 @@ jobs:
     steps:
       - attach_workspace:
           at: /tmp/workspace
+      - checkout
+      - run: |
+          # CRYSTAL_NEXT_VERSION uses src/VERSION to publish maintenance releases as prereleases
+          echo "export CRYSTAL_NEXT_VERSION=$(cat src/VERSION)" >> /tmp/workspace/distribution-scripts/build.env
       - run: |
           cd /tmp/workspace/distribution-scripts
 
@@ -355,6 +359,26 @@ jobs:
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz
 
+  dist_obs_maintenance:
+    docker:
+      - image: straightshoota/osc
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          command: |
+            cd /tmp/workspace/distribution-scripts
+            source build.env
+            # osc may try to use a pager, even if stdout is not a TTY,
+            # cat avoids stalling on that.
+            export PAGER=cat
+
+            packages/obs-setup.sh
+            packages/obs-push.sh devel:languages:crystal:nightly ${CRYSTAL_NEXT_VERSION%-*} ${CRYSTAL_VERSION} $CRYSTAL_SHA1 \
+                /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
+                /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
+                /tmp/workspace/build/crystal-*-docs.tar.gz
+
   dist_docker:
     machine: true
     steps:
@@ -718,6 +742,11 @@ workflows:
           filters: *maintenance
           requires:
             - dist_docker
+      - dist_obs_maintenance:
+          requires:
+            - dist_linux
+            - dist_linux32
+            - dist_docs
       - dist_artifacts:
           filters: *maintenance
           requires:

From d030895304a37cb5cfbe5e04fb963ddf737030ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 6 May 2021 17:14:15 +0200
Subject: [PATCH 12/20] Fix Crystal version for maintenance build

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e65b7da2a06e..52d977ea14b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -374,7 +374,7 @@ jobs:
             export PAGER=cat
 
             packages/obs-setup.sh
-            packages/obs-push.sh devel:languages:crystal:nightly ${CRYSTAL_NEXT_VERSION%-*} ${CRYSTAL_VERSION} $CRYSTAL_SHA1 \
+            packages/obs-push.sh devel:languages:crystal:unstable ${CRYSTAL_NEXT_VERSION%-*} ${CRYSTAL_VERSION/-/} $CRYSTAL_SHA1 \
                 /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz

From 014234a04f4782144c9ae02d63b5091a545eabca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 6 May 2021 19:38:57 +0200
Subject: [PATCH 13/20] Fix snapshot name

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 52d977ea14b0..e50a0bfaca20 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -239,7 +239,7 @@ jobs:
 
           # How to brand it
           export VERSION=${CIRCLE_BRANCH/release\//}
-          export VERSION=${VERSION/\//-}-dev
+          export VERSION=${VERSION//\//-}-dev
           echo "export CRYSTAL_VERSION=$VERSION" >> build.env
           echo "export DOCKER_TAG=$VERSION" >> build.env
 
@@ -374,7 +374,7 @@ jobs:
             export PAGER=cat
 
             packages/obs-setup.sh
-            packages/obs-push.sh devel:languages:crystal:unstable ${CRYSTAL_NEXT_VERSION%-*} ${CRYSTAL_VERSION/-/} $CRYSTAL_SHA1 \
+            packages/obs-push.sh devel:languages:crystal:unstable ${CRYSTAL_NEXT_VERSION%-*} ${CRYSTAL_VERSION//-/} $CRYSTAL_SHA1 \
                 /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz

From 3e2fa8bafa5798a16f977ff72de76be72baa14a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 6 May 2021 22:55:09 +0200
Subject: [PATCH 14/20] Update distribution-scripts commit

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e50a0bfaca20..dff44ed468fb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ jobs:
       - run: |
           git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
           cd ~/distribution-scripts
-          git checkout 8307d8d2e8fea4c8dd64ff15877fe0c3027e0d80
+          git checkout 2d7716ae3d1a28130d7f681de8510e46bd6f6638
       # persist relevant information for build process
       - run: |
           cd ~/distribution-scripts

From f1497685386a732793b3a4815f3ab5378b45f219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 8 May 2021 14:45:33 +0200
Subject: [PATCH 15/20] s/dist_obs/push_obs/

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dff44ed468fb..309d28a6c995 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -339,7 +339,7 @@ jobs:
           paths:
             - build
 
-  dist_obs_nightly:
+  push_obs_nightly:
     docker:
       - image: straightshoota/osc
     steps:
@@ -359,7 +359,7 @@ jobs:
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz
 
-  dist_obs_maintenance:
+  push_obs_maintenance:
     docker:
       - image: straightshoota/osc
     steps:
@@ -639,7 +639,7 @@ workflows:
       - dist_darwin:
           requires:
             - prepare_nightly
-      - dist_obs_nightly:
+      - push_obs_nightly:
           requires:
             - dist_linux
             - dist_linux32
@@ -742,7 +742,7 @@ workflows:
           filters: *maintenance
           requires:
             - dist_docker
-      - dist_obs_maintenance:
+      - push_obs_maintenance:
           requires:
             - dist_linux
             - dist_linux32

From ac49223979240f27b3add5efad5a7ac7f49caeff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 8 May 2021 15:12:57 +0200
Subject: [PATCH 16/20] Remove PAGER

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 309d28a6c995..2fa504559107 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -349,9 +349,6 @@ jobs:
           command: |
             cd /tmp/workspace/distribution-scripts
             source build.env
-            # osc may try to use a pager, even if stdout is not a TTY,
-            # cat avoids stalling on that.
-            export PAGER=cat
 
             packages/obs-setup.sh
             packages/obs-push.sh devel:languages:crystal:nightly ${CRYSTAL_VERSION%-*} $(date '+%Y%m%d') $CRYSTAL_SHA1 \

From 6580e417b962becb70217fce9b3f43ddc5a2a342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 8 May 2021 18:17:29 +0200
Subject: [PATCH 17/20] Use crystallang/osc docker image

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2fa504559107..07558f194d99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -341,7 +341,7 @@ jobs:
 
   push_obs_nightly:
     docker:
-      - image: straightshoota/osc
+      - image: crystallang/osc
     steps:
       - attach_workspace:
           at: /tmp/workspace
@@ -358,7 +358,7 @@ jobs:
 
   push_obs_maintenance:
     docker:
-      - image: straightshoota/osc
+      - image: crystallang/osc
     steps:
       - attach_workspace:
           at: /tmp/workspace

From 1cd72cf27bdf4c1331ed736dcec86a9118a0f0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 8 May 2021 18:17:50 +0200
Subject: [PATCH 18/20] Remove push_obs_maintenance

---
 .circleci/config.yml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 07558f194d99..2f7c940f423a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -356,26 +356,6 @@ jobs:
                 /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
                 /tmp/workspace/build/crystal-*-docs.tar.gz
 
-  push_obs_maintenance:
-    docker:
-      - image: crystallang/osc
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          command: |
-            cd /tmp/workspace/distribution-scripts
-            source build.env
-            # osc may try to use a pager, even if stdout is not a TTY,
-            # cat avoids stalling on that.
-            export PAGER=cat
-
-            packages/obs-setup.sh
-            packages/obs-push.sh devel:languages:crystal:unstable ${CRYSTAL_NEXT_VERSION%-*} ${CRYSTAL_VERSION//-/} $CRYSTAL_SHA1 \
-                /tmp/workspace/build/crystal-*-linux-x86_64.tar.gz \
-                /tmp/workspace/build/crystal-*-linux-i686.tar.gz \
-                /tmp/workspace/build/crystal-*-docs.tar.gz
-
   dist_docker:
     machine: true
     steps:

From a07740fdaf4a4c91b4ffa338e7f0f595b3c5a713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 8 May 2021 21:04:28 +0200
Subject: [PATCH 19/20] Remove reading version in prepare_maintenance

---
 .circleci/config.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2f7c940f423a..31e752f087a5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -230,10 +230,6 @@ jobs:
     steps:
       - attach_workspace:
           at: /tmp/workspace
-      - checkout
-      - run: |
-          # CRYSTAL_NEXT_VERSION uses src/VERSION to publish maintenance releases as prereleases
-          echo "export CRYSTAL_NEXT_VERSION=$(cat src/VERSION)" >> /tmp/workspace/distribution-scripts/build.env
       - run: |
           cd /tmp/workspace/distribution-scripts
 

From e62e2ae35bd5a2827d032e520819895adf5300d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 8 May 2021 21:51:20 +0200
Subject: [PATCH 20/20] fixup! Remove push_obs_maintenance

---
 .circleci/config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31e752f087a5..ce4cb7aacc2b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -715,11 +715,6 @@ workflows:
           filters: *maintenance
           requires:
             - dist_docker
-      - push_obs_maintenance:
-          requires:
-            - dist_linux
-            - dist_linux32
-            - dist_docs
       - dist_artifacts:
           filters: *maintenance
           requires: