Skip to content

Commit 0e60f20

Browse files
committed
ci: use default IPFS Gateway URL
1 parent 2983af6 commit 0e60f20

15 files changed

+13
-16
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export _NIX_GCROOTS = ./.nix-gcroots
5151
export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
5252
BUILD_TYPE,BUILD_NUMBER,COMMIT_HASH,\
5353
ANDROID_GRADLE_OPTS,ANDROID_ABI_SPLIT,ANDROID_ABI_INCLUDE,\
54-
STATUS_GO_SRC_OVERRIDE,STATUS_GO_IPFS_GATEWAY_URL
54+
STATUS_GO_SRC_OVERRIDE
5555

5656
# Useful for Android release builds
5757
TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)

ci/Jenkinsfile.android

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.combined

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
import groovy.json.JsonBuilder
55

ci/Jenkinsfile.e2e-nightly

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55
agent { label 'linux' }

ci/Jenkinsfile.ios

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.tests

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-nightly

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55

ci/tests/Jenkinsfile.e2e-prs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55

ci/tests/Jenkinsfile.e2e-upgrade

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55

ci/tools/Jenkinsfile.fastlane-clean

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55
agent { label 'macos' }

ci/tools/Jenkinsfile.nix-cache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55
agent { label params.AGENT_LABEL }

ci/tools/Jenkinsfile.playstore-meta

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55
agent { label 'linux' }

ci/tools/Jenkinsfile.xcode-clean

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library 'status-jenkins-lib@v1.9.8'
2+
library 'status-jenkins-lib@remove-ipfs-gateway-config'
33

44
pipeline {
55
agent {

nix/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export ANDROID_ABI_SPLIT=false
2424
export ANDROID_ABI_INCLUDE="x86"
2525
# Local source override, see below
2626
export STATUS_GO_SRC_OVERRIDE="$HOME/my/source/status-go"
27-
export STATUS_GO_IPFS_GATEWAY_URL="https://ipfs.status.im/"
2827
```
2928
You can see the defaults in code:
3029
- [`nix/status-go/default.nix`](./status-go/default.nix)

nix/status-go/default.nix

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ let
1717
goBuildParams = {
1818
GitCommit = source.rev;
1919
Version = source.cleanVersion;
20-
# FIXME: This should be moved to status-go config.
21-
IpfsGatewayURL = getEnvWithDefault "STATUS_GO_IPFS_GATEWAY_URL" "https://ipfs.status.im/";
2220
};
2321

2422
# These are necessary for status-go to show correct version

0 commit comments

Comments
 (0)