Skip to content

Commit 4cb7a8c

Browse files
aptalcathelamer
authored andcommitted
don't build PRs
1 parent b1bc927 commit 4cb7a8c

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN \
2020
mkdir -p \
2121
/opt/ombi && \
2222
if [ -z ${OMBI_RELEASE+x} ]; then \
23-
OMBI_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop")) | .version'); \
23+
OMBI_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop") | select(.pullRequestId == null)) | .version'); \
2424
fi && \
2525
OMBI_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/tidusjar/requestplex/build/${OMBI_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \
2626
OMBI_DURL="https://ci.appveyor.com/api/buildjobs/${OMBI_JOBID}/artifacts/linux.tar.gz"; \

Dockerfile.aarch64

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN \
2020
mkdir -p \
2121
/opt/ombi && \
2222
if [ -z ${OMBI_RELEASE+x} ]; then \
23-
OMBI_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop")) | .version'); \
23+
OMBI_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop") | select(.pullRequestId == null)) | .version'); \
2424
fi && \
2525
OMBI_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/tidusjar/requestplex/build/${OMBI_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \
2626
OMBI_DURL="https://ci.appveyor.com/api/buildjobs/${OMBI_JOBID}/artifacts/linux-arm64.tar.gz"; \

Dockerfile.armhf

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN \
2020
mkdir -p \
2121
/opt/ombi && \
2222
if [ -z ${OMBI_RELEASE+x} ]; then \
23-
OMBI_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop")) | .version'); \
23+
OMBI_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop") | select(.pullRequestId == null)) | .version'); \
2424
fi && \
2525
OMBI_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/tidusjar/requestplex/build/${OMBI_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \
2626
OMBI_DURL="https://ci.appveyor.com/api/buildjobs/${OMBI_JOBID}/artifacts/linux-arm.tar.gz"; \

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pipeline {
105105
steps{
106106
script{
107107
env.EXT_RELEASE = sh(
108-
script: ''' curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop")) | .version' ''',
108+
script: ''' curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop") | select(.pullRequestId == null)) | .version' ''',
109109
returnStdout: true).trim()
110110
env.RELEASE_LINK = 'custom_command'
111111
}

jenkins-vars.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-ombi
55
external_type: na
6-
custom_version_command: curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop")) | .version'
6+
custom_version_command: curl -sL GET https://ci.appveyor.com/api/projects/tidusjar/requestplex/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="develop") | select(.pullRequestId == null)) | .version'
77
release_type: prerelease
88
release_tag: development
99
ls_branch: development

0 commit comments

Comments
 (0)