prepare makepkg prior to prepare ky

e5f9adf0 · Chaoting Liu · f24fd1c5 · e5f9adf0
Commit e5f9adf0 authored Jul 30, 2020 by Chaoting Liu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +2 -2

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,8 @@ before_script:
  - git clone --depth 1 https://code.chakralinux.org/tools/chakra-gitlab-ci-scripts _gitlab-ci-scripts
  # setup basic environment settings, as root
  - _gitlab-ci-scripts/prepare.sh
+  # setup makepkg settings (enable and sync the correct repository), as root
+  - _gitlab-ci-scripts/prepare_makepkg.sh
  # configure encryption environments
  - sudo -u builder -E -H _gitlab-ci-scripts/prepare_keys.sh

@@ -20,8 +22,6 @@ makepkg:
  only:
    - merge_requests
  script:
-    # setup makepkg settings (enable and sync the correct repository), as root
-    - _gitlab-ci-scripts/prepare_makepkg.sh
    # the build script can't be run as root, as makepkg would complain...
    - sudo -u builder -E -H _gitlab-ci-scripts/build.sh