From 13f87020eb134c86bdb82e1d2fca8ce5bd150a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 23 Feb 2024 08:59:41 +0100 Subject: [PATCH] ci: drop NIX_IGNORE_SYMLINK_STORE from Makefile and CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a fix applied when upgrading to macOS Catalina in 2019: https://github.com/status-im/status-mobile/pull/9218 I do not believe it is necessary any longer. Signed-off-by: Jakub SokoĊ‚owski --- Makefile | 6 ------ ci/Jenkinsfile.ios | 2 -- ci/tools/Jenkinsfile.fastlane-clean | 2 -- ci/tools/Jenkinsfile.nix-cache | 2 -- ci/tools/Jenkinsfile.playstore-meta | 2 -- 5 files changed, 14 deletions(-) diff --git a/Makefile b/Makefile index 18ca317c78..faa86c44a7 100644 --- a/Makefile +++ b/Makefile @@ -56,12 +56,6 @@ export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\ # Useful for Android release builds TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10) -# MacOS root is read-only, read nix/README.md for details -UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) -export NIX_IGNORE_SYMLINK_STORE=1 -endif - #---------------- # Nix targets #---------------- diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index fd18541eb8..a8c25525af 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -39,8 +39,6 @@ pipeline { LANGUAGE = "en_US.UTF-8" TARGET = 'ios' NIX_CONF_DIR = "${env.WORKSPACE}/nix" - /* See nix/README.md */ - NIX_IGNORE_SYMLINK_STORE = 1 FASTLANE_DISABLE_COLORS = 1 BUNDLE_PATH = "${HOME}/.bundle" } diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index e2b23ddd3a..428ad5fa55 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -10,8 +10,6 @@ pipeline { LC_ALL = 'en_US.UTF-8' TARGET = 'ios' FASTLANE_DISABLE_COLORS = 1 - /* See nix/README.md */ - NIX_IGNORE_SYMLINK_STORE = 1 /* avoid writing to r/o /nix */ GEM_HOME = '~/.rubygems' } diff --git a/ci/tools/Jenkinsfile.nix-cache b/ci/tools/Jenkinsfile.nix-cache index fbb4bc6be4..1e6be2907a 100644 --- a/ci/tools/Jenkinsfile.nix-cache +++ b/ci/tools/Jenkinsfile.nix-cache @@ -18,8 +18,6 @@ pipeline { } environment { - /* See nix/README.md */ - NIX_IGNORE_SYMLINK_STORE = 1 /* we source .bash_profile to be able to use nix-store */ NIX_SSHOPTS = "-oStrictHostKeyChecking=no" NIX_CONF_DIR = "${env.WORKSPACE}/nix" diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index be389599f5..434f1eb6da 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -10,8 +10,6 @@ pipeline { LC_ALL = 'en_US.UTF-8' TARGET = 'ios' FASTLANE_DISABLE_COLORS = 1 - /* See nix/README.md */ - NIX_IGNORE_SYMLINK_STORE = 1 /* avoid writing to r/o /nix */ GEM_HOME = '~/.rubygems' }