From c9efc177465071107da77e97247abee1c2a27845 Mon Sep 17 00:00:00 2001 From: "russell@unturf.com" Date: Fri, 13 Feb 2026 17:17:49 -0500 Subject: [PATCH] deploy via proxy.uncloseai.com runner (replace Salt) --- .gitlab-ci-deploy.yml | 11 ----------- .gitlab-ci.yml | 25 ++++++------------------- 2 files changed, 6 insertions(+), 30 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 ae12f59..0000000 --- a/.gitlab-ci-deploy.yml +++ /dev/null @@ -1,11 +0,0 @@ -stages: - - deploy - -deploy_to_www_unturf_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 5716b1f..a407f33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,10 @@ stages: - - build - - trigger-deploy + - deploy -build: - stage: build - tags: ["build"] +deploy: + stage: deploy + tags: ["proxy.uncloseai.com"] script: - - ./make_tarball.sh - artifacts: - paths: - - www.unturf.com.tar.gz - - www.unturf.com.tar.gz.hash - - commit-hash.txt - expire_in: 1 month - -trigger_deploy: - stage: trigger-deploy - trigger: - include: - - local: .gitlab-ci-deploy.yml + - sudo /usr/local/bin/deploy-www.sh unturf . rules: - - if: '$CI_COMMIT_BRANCH == "master"' \ No newline at end of file + - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main"'