From 11605d92d49cd9bcb3215b98d7833d0d3e263e30 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 24 Nov 2020 22:39:40 -0500 Subject: [PATCH 1/2] set yarn network timeout --- .github/workflows/external_trigger.yml | 10 +++++++--- .github/workflows/package_trigger.yml | 9 +++++++-- .github/workflows/package_trigger_scheduler.yml | 6 ++++++ Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 07b9c51..24c8151 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -19,7 +19,7 @@ jobs: echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER\". ****" echo "**** Retrieving external version ****" EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/cdr/code-server/releases/latest" | jq -r '. | .tag_name') - if [ -z "${EXT_RELEASE}" ]; then + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for code-server branch master" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, @@ -62,17 +62,21 @@ jobs: if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" exit 0 + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + exit 0 else echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response} ****" + echo "**** Jenkins job queue url: ${response%$'\r'} ****" echo "**** Sleeping 10 seconds until job starts ****" sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl}; attempting to change the job description ****" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index afb9943..3199c2d 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -16,16 +16,21 @@ jobs: echo "**** Github secret PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER is set; skipping trigger. ****" exit 0 fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER\". ****" response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response} ****" + echo "**** Jenkins job queue url: ${response%$'\r'} ****" echo "**** Sleeping 10 seconds until job starts ****" sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl}; attempting to change the job description ****" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index dd3d617..72d4cb2 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -29,6 +29,7 @@ jobs: echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -42,3 +43,8 @@ jobs: echo "**** ${br} appears to be a dev branch; skipping trigger. ****" fi done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for code-server** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-code-server/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/Dockerfile b/Dockerfile index 02d9f7c..c76cd46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ RUN \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \ + yarn config set network-timeout 600000 -g && \ yarn --production --frozen-lockfile global add code-server@"$CODE_VERSION" && \ yarn cache clean && \ echo "**** clean up ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 951bc57..fac2a06 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -44,6 +44,7 @@ RUN \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \ + yarn config set network-timeout 600000 -g && \ yarn --production --frozen-lockfile global add code-server@"$CODE_VERSION" && \ yarn cache clean && \ echo "**** clean up ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a15f438..3290e4e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -44,6 +44,7 @@ RUN \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \ + yarn config set network-timeout 600000 -g && \ yarn --production --frozen-lockfile global add code-server@"$CODE_VERSION" && \ yarn cache clean && \ echo "**** clean up ****" && \ From 2ae2a47c39593eb85c7e5446f5b59e4072da0315 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 24 Nov 2020 23:02:45 -0500 Subject: [PATCH 2/2] add verbosity to yarn --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c76cd46..bcc6f27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ RUN \ fi && \ CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \ yarn config set network-timeout 600000 -g && \ - yarn --production --frozen-lockfile global add code-server@"$CODE_VERSION" && \ + yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \ yarn cache clean && \ echo "**** clean up ****" && \ apt-get purge --auto-remove -y \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index fac2a06..cd4f211 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -45,7 +45,7 @@ RUN \ fi && \ CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \ yarn config set network-timeout 600000 -g && \ - yarn --production --frozen-lockfile global add code-server@"$CODE_VERSION" && \ + yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \ yarn cache clean && \ echo "**** clean up ****" && \ apt-get purge --auto-remove -y \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3290e4e..5822ad0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -45,7 +45,7 @@ RUN \ fi && \ CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \ yarn config set network-timeout 600000 -g && \ - yarn --production --frozen-lockfile global add code-server@"$CODE_VERSION" && \ + yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \ yarn cache clean && \ echo "**** clean up ****" && \ apt-get purge --auto-remove -y \