From 229fcb4b32e20a1a9a76294476d036b859f94167 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Thu, 3 Oct 2024 16:55:35 +0000
Subject: [PATCH] Revert "Update .gitlab-ci.yml file"

This reverts commit 6e3d2b15e10028aeccd7c0acfa158732a6daec40
---
 .gitlab-ci.yml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20a5cdb..a3fee0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,18 @@
-install:
-  image: node:21.7.3
-  before_script:
-    - corepack enable
-    - pnpm config set store-dir .pnpm-store
+merge:
+  image: docker:cli
+  stage: test
+  services:
+    - docker:dind
+  variables:
+    DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   script:
-    - pnpm install
-  cache:
-    key:
-      files:
-        - pnpm-lock.yaml
-    paths:
-      - .pnpm-store
+    - docker build -t "$DOCKER_IMAGE_NAME" .
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 
 build:
   image: docker:cli
+  stage: build
   services:
     - docker:dind
   variables:
@@ -26,6 +25,4 @@ build:
         docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:main"
         docker push "$CI_REGISTRY_IMAGE:main"
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-  dependencies:
-    - install
\ No newline at end of file
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
\ No newline at end of file