diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index da3019b6..58eaab1c 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -12,29 +12,5 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/3.10' run: | - if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_ALPINE_NGINX_3.10 }}" ]; then - echo "Github secret PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_ALPINE_NGINX_3.10 is set; skipping trigger." - exit 0 - fi - echo "External trigger running off of 3.10 branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BASEIMAGE_ALPINE_NGINX_3.10\"." - echo "Setting env vars" - BUILD_VERSION_ARG='OS' - LS_USER='linuxserver' - LS_REPO='docker-baseimage-alpine-nginx' - CONTAINER_NAME='baseimage-alpine-nginx' - DOCKERHUB_IMAGE='lsiobase/nginx' - DEV_DOCKERHUB_IMAGE='lsiodev/baseimage-nginx' - PR_DOCKERHUB_IMAGE='lspipepr/baseimage-nginx' - DIST_IMAGE='alpine' - MULTIARCH='true' - CI='true' - CI_WEB='true' - CI_PORT='80' - CI_SSL='true' - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' - CI_WEBPATH='' - echo "Retrieving external version" echo "No external release, exiting." exit 0 diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 7386c2f6..684fb168 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -12,11 +12,11 @@ jobs: - name: Package Trigger if: github.ref == 'refs/heads/3.10' run: | - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3.10 }}" ]; then - echo "Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3.10 is set; skipping trigger." + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_10 }}" ]; then + echo "Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_10 is set; skipping trigger." exit 0 fi - echo "Package trigger running off of 3.10 branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3.10\"." + echo "Package trigger running off of 3.10 branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_ALPINE_NGINX_3_10\"." curl -X POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.10/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ No newline at end of file