From 98eeddcfb67dd6e75bec4f09d160956c6c912072 Mon Sep 17 00:00:00 2001
From: KunoiSayami <i@leanhe.dev>
Date: Tue, 26 Oct 2021 00:34:13 +0800
Subject: fix(ci): Fix ci stage not working properly

Signed-off-by: KunoiSayami <i@leanhe.dev>
---
 .gitlab-ci.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68dc467..621ae5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,12 +5,15 @@ default:
     archlinux:latest
 
 stages:
-  - pkg
+  - build
   - post
 
 build:
-  stage: pkg
+  stage: build
 
+  artifacts:
+    untracked: true
+    expire_in: 1 day
   only:
     changes:
       - repo/**/*
@@ -19,16 +22,16 @@ build:
     - pacman --noconfirm --needed -Syu base-devel gnupg git
     - useradd -m build
     - echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers
-    - cp -r ../$CI_PROJECT_TITLE  /home/build/
-    - cd /home/build/$CI_PROJECT_TITLE
-    - echo $GPG_PRIV_KEY | base64 -d > ../key.asc
+    #- cp -r ../$CI_PROJECT_TITLE  /home/build/
+    #- cd /home/build/$CI_PROJECT_TITLE
     - chown -R build:build ../$CI_PROJECT_TITLE
     - su -c "bash -c 'cd repo/pod2man && makepkg -i --noconfirm'" build
-    - su -c 'gpg --import ../key.asc' build
-    - su -c 'BUILD_ONLY='' ./pkgbuild.sh --all' build
+    - su -c 'echo $GPG_PRIV_KEY | base64 -d | gpg --import' build
+    - su -c 'BUILD_ONLY='' ./pkgbuild.sh' build
+    - rm -rf build/
 
 # only push to master master trigger push
-push:
+post:
   stage: post
 
   only:
@@ -38,5 +41,5 @@ push:
       - repo/**/*
 
   script:
-    - cd /home/build/$CI_PROJECT_TITLE
-    - su -m -c './ci-upload.sh' build
+    - if [ -n "$TARGET_HOSTS" ]; then echo "$TARGET_HOSTS" | base64 -d >> /etc/hosts; fi;
+    - bash -c './ci-upload.sh'
-- 
cgit v1.3.1