From 5a887909ceb42cd74077d5fa4f294912955586ce Mon Sep 17 00:00:00 2001
From: nesteroff561 <nesteroff561@Airnesteroff561.nesteroff561.local>
Date: Fri, 30 May 2025 20:56:20 +0300
Subject: [PATCH] removed rules

---
 .gitlab-ci.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a5323b..f13583b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,11 @@
-<<<<<<< HEAD
 stages:
  - prebuild
  - build
  - postbuild
 prebuild:
  stage: prebuild
- rules:
-    - if: '$CI_COMMIT_TAG'
+# rules:
+#    - if: '$CI_COMMIT_TAG'
  tags:
   - iso-builder
  script:
@@ -31,8 +30,8 @@ tileos-sway-amd64:
   - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/sway/
 
 tileos-river-amd64:
- rules:
-    - if: '$CI_COMMIT_TAG'
+ #rules:
+ #   - if: '$CI_COMMIT_TAG'
  when: manual
  stage: build
  variables:
@@ -51,8 +50,8 @@ tileos-river-amd64:
   - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/
 
 mrproper:
- rules:
-    - if: '$CI_COMMIT_TAG'
+ #rules:
+ #   - if: '$CI_COMMIT_TAG'
  stage: postbuild
  when: on_success
  tags:
@@ -62,11 +61,3 @@ mrproper:
   - tileos-river-amd64
  script:
   - docker system prune -a -f
-=======
-build:
- when: manual
- stage: build
- script:
-  - docker run --privileged -i -v /proc:/proc -v ${PWD}:/working_dir -w /working_dir -e DESKTOP=sway debian:latest /bin/bash -s etc/terraform.conf < build.sh
- 
->>>>>>> 4af10dc (Adding CI)