Refresh repo and build image in separate pipeline

.gitlab-ci.yml

@@ -5,6 +5,8 @@ stages:
 
 'Sync Haskell':
   stage: 'sync'
+  rules:
+    - if: '$BUILD_IMAGE != "1"'
   script:
     # Config
     - 'git config --global user.name "Nest CI"'
@@ -15,7 +17,7 @@ stages:
     - 'cat "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts'
 
     # Sync
-    - 'git pull --no-edit https://github.com/gentoo-haskell/gentoo-haskell.git'
+    - 'git pull --no-edit --strategy=resolve https://github.com/gentoo-haskell/gentoo-haskell.git'
 
     # Generate metadata
     - 'echo -e "[haskell]\nlocation = ${PWD}" > /etc/portage/repos.conf/haskell.conf'
@@ -27,11 +29,13 @@ stages:
     - 'git add -f metadata/md5-cache profiles/use.local.desc'
     - 'git commit -m "$(date -I) snapshot"'
     - 'git remote set-url origin git@gitlab.james.tl:nest/gentoo/haskell.git'
-    - 'git push -o ci.skip origin "HEAD:${CI_COMMIT_BRANCH}"'
+    - 'git push -o ci.variable="BUILD_IMAGE=1" origin "HEAD:${CI_COMMIT_BRANCH}"'
 
 'Build Image':
-  stage: 'build'
   image: '${CI_REGISTRY}/nest/tools/buildah:${CI_HOST_CPU}'
+  stage: 'build'
+  rules:
+    - if: '$BUILD_IMAGE == "1"'
   script:
     - 'buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"'
     - 'buildah bud --pull -t "$CI_REGISTRY_IMAGE" -f .Containerfile .'