From c4462ed40b2fbf7b8932208742e2492d05b6ada9 Mon Sep 17 00:00:00 2001
From: Robin Candau <antiz@archlinux.org>
Date: Sat, 28 Mar 2026 14:53:14 +0100
Subject: [PATCH] Fix ordering in GitLab CI and Makefile

---
 .gitlab-ci.yml | 36 ++++++++++++++++++------------------
 Makefile       |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf0eb0b..42d5e7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ get_version:
   stage: rootfs
   parallel:
     matrix:
-      - GROUP: [repro, base, base-devel, multilib-devel]
+      - GROUP: [base, base-devel, multilib-devel, repro]
   before_script:
     - pacman -Syu --noconfirm git make fakechroot fakeroot
     - pacman -Sdd --noconfirm devtools
@@ -98,7 +98,7 @@ rootfs:secure:
   stage: image
   parallel:
     matrix:
-      - GROUP: [repro, base, base-devel, multilib-devel]
+      - GROUP: [base, base-devel, multilib-devel, repro]
   tags:
     - vm
   id_tokens:
@@ -192,12 +192,6 @@ image:publish:secure:
   - id -u http
   - locale | grep -q UTF-8
 
-test:repro:
-  extends: .test
-  image: $CI_REGISTRY_IMAGE:repro-$CI_COMMIT_REF_SLUG
-  script:
-    - *test-script
-
 test:base:
   extends: .test
   image: $CI_REGISTRY_IMAGE:base-$CI_COMMIT_REF_SLUG
@@ -215,6 +209,12 @@ test:base-devel:
     - test -u /usr/bin/sudo   # issue 70
     - test -u /usr/bin/passwd
 
+test:repro:
+  extends: .test
+  image: $CI_REGISTRY_IMAGE:repro-$CI_COMMIT_REF_SLUG
+  script:
+    - *test-script
+
 pre-release:
   stage: pre-release
   image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -240,7 +240,7 @@ pre-release:
            -d "{\"full_description\": $(cat README.md | jq -sR .)}"
 
       # Upload rootfs to the Generic Packages Repository
-      for group in repro base base-devel multilib-devel; do
+      for group in base base-devel multilib-devel repro; do
         rootfs_file="${group}-${BUILD_VERSION}.tar.zst"
         mv "output/${group}.tar.zst" "output/${rootfs_file}"
         mv "output/${group}.tar.zst.SHA256" "output/${rootfs_file}.SHA256"
@@ -252,7 +252,7 @@ pre-release:
       done
 
       # Create the Dockerfiles, commit to the release branch
-      for group in repro base base-devel multilib-devel; do
+      for group in base base-devel multilib-devel repro; do
         rootfs_file="${group}-${BUILD_VERSION}.tar.zst"
         ./scripts/make-dockerfile.sh "${rootfs_file}" "${group}" "output" "curl -sOJL \"${PACKAGE_REGISTRY_URL}/${rootfs_file}\"" "${group}"
         sed -i "/^COPY ${rootfs_file} \/$/d" output/Dockerfile.${group}
@@ -264,9 +264,6 @@ pre-release:
       --form "branch=releases"
       --form "commit_message=Release ${BUILD_VERSION}"
       --form "actions[][action]=update"
-      --form "actions[][file_path]=Dockerfile.repro"
-      --form "actions[][content]=<output/Dockerfile.repro"
-      --form "actions[][action]=update"
       --form "actions[][file_path]=Dockerfile.base"
       --form "actions[][content]=<output/Dockerfile.base"
       --form "actions[][action]=update"
@@ -276,6 +273,9 @@ pre-release:
       --form "actions[][file_path]=Dockerfile.multilib-devel"
       --form "actions[][content]=<output/Dockerfile.multilib-devel"
       --form "actions[][action]=update"
+      --form "actions[][file_path]=Dockerfile.repro"
+      --form "actions[][content]=<output/Dockerfile.repro"
+      --form "actions[][action]=update"
       --form "actions[][file_path]=.gitlab-ci.yml"
       --form "actions[][content]=<.gitlab-ci.yml"
       --form "actions[][action]=update"
@@ -310,10 +310,6 @@ release:
     ref: 'releases'
     assets:
       links:
-        - name: 'repro-${BUILD_VERSION}.tar.zst
-          url: '${PACKAGE_REGISTRY_URL}/repro-${BUILD_VERSION}.tar.zst'
-        - name: 'repro-${BUILD_VERSION}.tar.zst.SHA256'
-          url: '${PACKAGE_REGISTRY_URL}/repro-${BUILD_VERSION}.tar.zst.SHA256'
         - name: 'base-${BUILD_VERSION}.tar.zst
           url: '${PACKAGE_REGISTRY_URL}/base-${BUILD_VERSION}.tar.zst'
         - name: 'base-${BUILD_VERSION}.tar.zst.SHA256'
@@ -326,6 +322,10 @@ release:
           url: '${PACKAGE_REGISTRY_URL}/multilib-devel-${BUILD_VERSION}.tar.zst'
         - name: 'multilib-devel-${BUILD_VERSION}.tar.zst.SHA256'
           url: '${PACKAGE_REGISTRY_URL}/multilib-devel-${BUILD_VERSION}.tar.zst.SHA256'
+        - name: 'repro-${BUILD_VERSION}.tar.zst
+          url: '${PACKAGE_REGISTRY_URL}/repro-${BUILD_VERSION}.tar.zst'
+        - name: 'repro-${BUILD_VERSION}.tar.zst.SHA256'
+          url: '${PACKAGE_REGISTRY_URL}/repro-${BUILD_VERSION}.tar.zst.SHA256'
 
 # Publish to the official Docker namespace: https://hub.docker.com/_/archlinux
 # Note: The description is maintained here: https://github.com/docker-library/docs/tree/master/archlinux
@@ -360,7 +360,7 @@ publish-dockerhub:
     - git checkout -b "$head"
     - cp ../docker-library.template library/archlinux
     - |
-      for group in repro base base-devel multilib-devel; do
+      for group in base base-devel multilib-devel repro; do
         test "${group}" = "base" && extra="latest, " || extra=""
         echo "Tags: ${extra}${group}, ${group}-${BUILD_VERSION}" >> library/archlinux
         echo "GitCommit: ${BUILD_COMMIT}" >> library/archlinux
diff --git a/Makefile b/Makefile
index 09b1159..482707d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,6 @@ $(OUTPUTDIR)/Dockerfile.%: $(OUTPUTDIR)/%.tar.zst
 
 # The following is for local builds only, it is not used by the CI/CD pipeline
 
-all: image-repro image-base image-base-devel image-multilib-devel
+all: image-base image-base-devel image-multilib-devel image-repro
 image-%: $(OUTPUTDIR)/Dockerfile.%
 	${OCITOOL} build -f $(OUTPUTDIR)/Dockerfile.$(*) -t archlinux/archlinux:$(*) $(OUTPUTDIR)