From 1a1089e341fab77e84e3d7ac88a229e3b71f9bb3 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sun, 25 Oct 2020 03:53:53 +0100
Subject: [PATCH] Merge things down a bit

---
 .gitlab-ci.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65301e0..191ce6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,9 +161,9 @@ test:base-devel:
     - g++ -v
     - make -v
 
-upload_and_commit_rootfs:
-  stage: upload
-  image: curlimages/curl:latest
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
   tags:
     - secure
   only:
@@ -171,6 +171,8 @@ upload_and_commit_rootfs:
       - schedules
     variables:
       - $SCHEDULED_PUBLISH == "TRUE"
+  before_script:
+    - apk add jq curl
   script:
     - |
       for group in base base-devel; do
@@ -194,20 +196,6 @@ upload_and_commit_rootfs:
       --form "actions[][file_path]=ci/base-devel/Dockerfile"
       --form "actions[][content]=<ci/base-devel/Dockerfile"
       "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/commits"
-
-release:
-  stage: release
-  image: registry.gitlab.com/gitlab-org/release-cli:latest
-  tags:
-    - secure
-  only:
-    refs:
-      - schedules
-    variables:
-      - $SCHEDULED_PUBLISH == "TRUE"
-  before_script:
-    - apk add jq curl
-  script:
     - |
       base_url=$(./ci/get-public-download-for-generic-package.sh base-${BUILD_VERSION}.tar.xz)
       base_sha_url=$(./ci/get-public-download-for-generic-package.sh base-${BUILD_VERSION}.tar.xz.SHA256)