From 60918eedbad8a7e797fda78960822fef436b0f9f Mon Sep 17 00:00:00 2001 From: "russell@unturf.com" Date: Fri, 13 Feb 2026 17:17:45 -0500 Subject: [PATCH] deploy via proxy.uncloseai.com runner (replace Salt) --- .gitlab-ci-deploy.yml | 11 ----------- .gitlab-ci.yml | 32 +++++--------------------------- 2 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 .gitlab-ci-deploy.yml diff --git a/.gitlab-ci-deploy.yml b/.gitlab-ci-deploy.yml deleted file mode 100644 index e181930..0000000 --- a/.gitlab-ci-deploy.yml +++ /dev/null @@ -1,11 +0,0 @@ -stages: - - deploy - -www.makepostsell.com: - stage: deploy - tags: ["mps-router1"] - script: - # publish build to Salt Master - - sudo /opt/salt-call-state-highstate.sh - rules: - - if: '$CI_COMMIT_BRANCH == "master"' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dc7741..6e0a0ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,32 +1,10 @@ stages: - - build - deploy - -build: - stage: build - tags: ["build"] - script: - #tar -zcvf www.makepostsell.com.tar.gz output - - rm -rf .git - - cd ..; tar -zcvf www.makepostsell.com.tar.gz www.makepostsell.com; mv www.makepostsell.com.tar.gz www.makepostsell.com; cd www.makepostsell.com - # create sha512 of www.makepostsell.com.tar.gz - - sha512sum www.makepostsell.com.tar.gz >> www.makepostsell.com.tar.gz.hash - # create commit-hash.txt to track this build's git commit hash. - - echo $CI_COMMIT_SHA >> commit-hash.txt - - artifacts: - paths: - - www.makepostsell.com.tar.gz - - www.makepostsell.com.tar.gz.hash - - commit-hash.txt - #expire_in: 1 month - -trigger_deploy: +deploy: stage: deploy - trigger: - include: - - local: .gitlab-ci-deploy.yml + tags: ["proxy.uncloseai.com"] + script: + - sudo /usr/local/bin/deploy-www.sh makepostsell . rules: - - if: '$CI_COMMIT_BRANCH == "master"' - + - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main"'