From 1b8aea87b2f39661e731a73b258f4ad20ea0b750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 24 Aug 2022 15:12:42 +0200 Subject: [PATCH] ci: use different IPFS gateway for release builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/status-im/status-go/compare/f43f43cc...86054875 Depends on: https://github.com/status-im/status-jenkins-lib/pull/44 Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.ios | 2 +- ci/Jenkinsfile.nix-cache | 2 +- ci/tests/Jenkinsfile.e2e-prs | 2 +- ci/tools/Jenkinsfile.fastlane-clean | 2 +- ci/tools/Jenkinsfile.playstore-meta | 2 +- nix/config.nix | 5 ++++- nix/status-go/default.nix | 4 +++- status-go-version.json | 6 +++--- 10 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index 4ee92f2525..8f51a11d79 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index c0c0bae498..22e398f6c5 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index 790a7ae789..9c7439039f 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache index 085f14cd27..7468b1ee0d 100644 --- a/ci/Jenkinsfile.nix-cache +++ b/ci/Jenkinsfile.nix-cache @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label params.AGENT_LABEL } diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index 04b2985e78..f246c07def 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index a60948f0b2..737c4ab5b1 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label 'macos' } diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index 7fd11ae33d..247a7c44ce 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.5.0' +library 'status-jenkins-lib@v1.5.1' pipeline { agent { label 'linux' } diff --git a/nix/config.nix b/nix/config.nix index 110b441448..0790641a22 100644 --- a/nix/config.nix +++ b/nix/config.nix @@ -12,7 +12,10 @@ abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for }; - status-go = { src-override = null; }; + status-go = { + src-override = null; + ipfs-gateway-url = "https://ipfs.status.im/"; + }; }; # Android SDK requires an accepted license diff --git a/nix/status-go/default.nix b/nix/status-go/default.nix index 1c71ae5087..4de9a64786 100644 --- a/nix/status-go/default.nix +++ b/nix/status-go/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, mkShell }: let - inherit (lib) attrValues mapAttrs; + inherit (lib) getConfig attrValues mapAttrs; # Metadata common to all builds of status-go meta = { @@ -17,6 +17,8 @@ let goBuildParams = { GitCommit = source.rev; Version = source.cleanVersion; + # FIXME: This should be moved to status-go config. + IpfsGatewayURL = getConfig "status-go.ipfs-gateway-url" "https://ipfs.status.im/"; }; # These are necessary for status-go to show correct version diff --git a/status-go-version.json b/status-go-version.json index d0794a2410..20772ff012 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.106.2", - "commit-sha1": "f43f43cc30e56d342cf8d25d2e0e56aecc83fa6e", - "src-sha256": "0j9xgkblv56h3vvkiwsy3wnwazs0fcs4z3f3mvlvs058vpdkv9hw" + "version": "v0.107.0", + "commit-sha1": "86054875a4f0296ed38858553448dfe92c14da9c", + "src-sha256": "1mw6v20h20g1zy30qs97ys2dv5nggzvdbfmdfygwvf3fj018yklg" }