ci

.gitlab-ci.yml

 stages:
-  - fetch
   - build
-  - combine
   - deploy
-
 variables:
   GIT_DEPTH: "1"
-  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  CONTAINER_TEST_ARM_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
-  CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
-  GO_CQHTTP_VERSION: master
 
-.dockertask:
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  dependencies: []
-  tags: 
-    - docker
+before_script:
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-fetch_source:
-  stage: fetch
-  tags:
-    - linux
+.build-image:
+  stage: build
   script:
-    - git clone --depth=1 -b $GO_CQHTTP_VERSION https://github.com/Mrs4s/go-cqhttp
-    - rm -rf go-cqhttp/.git*
-    - echo 'CMD [ "-faststart" ]' >> go-cqhttp/Dockerfile
-  artifacts:
-    paths:
-      - ./go-cqhttp
+    - docker build --pull -t $TARGET_IMAGE .
+    - docker push $TARGET_IMAGE
 
-.build:
-  stage: build
-  dependencies:
-    - fetch_source
-  tags: 
+build-x86:
+  extends: .build-image
+  tags:
     - docker
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
 
 build-x86:
-  extends:
-    - .dockertask
-    - .build
-  script:
-    - cd go-cqhttp
-    - docker build --pull -t $CONTAINER_TEST_X86_IMAGE .
-    - docker push $CONTAINER_TEST_X86_IMAGE
-
-build-arm:
-  extends:
-    - .dockertask
-    - .build
-  tags: 
+  extends: .build-image
+  tags:
     - docker-arm
-  script:
-    - cd go-cqhttp
-    - docker build --pull -t $CONTAINER_TEST_ARM_IMAGE .
-    - docker push $CONTAINER_TEST_ARM_IMAGE
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
 
-combine:
-  extends:
-    - .dockertask
-  stage: combine
+.deploy:
+  stage: deploy
+  tags:
+    - docker
   script:
-    - docker pull $CONTAINER_TEST_X86_IMAGE
-    - docker pull $CONTAINER_TEST_ARM_IMAGE
-    - docker manifest create $CONTAINER_TEST_IMAGE --amend $CONTAINER_TEST_X86_IMAGE --amend $CONTAINER_TEST_ARM_IMAGE
-    - docker manifest push $CONTAINER_TEST_IMAGE
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+    - docker manifest create $TARGET_IMAGE --amend $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86 --amend
+      $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+    - docker manifest push $TARGET_IMAGE
 
 deploy_latest:
-  stage: deploy
-  extends:
-    - .dockertask
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
+  extends: .deploy
+  vars:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:latest
   only:
     - master
+
+deploy_branch:
+  extends: .deploy
+  vars:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG