From a30faed641d958162898f45b66051e9f38a6957c Mon Sep 17 00:00:00 2001 From: kean Date: Sat, 20 Jul 2024 07:16:34 -0400 Subject: [PATCH] Move scripts to a hidden folder --- .github/workflows/ci.yml | 36 ++++++++--------- {Scripts => .scripts}/create-xcframeworks.sh | 0 {Scripts => .scripts}/install_swiftlint.sh | 0 {Scripts => .scripts}/lint.sh | 0 {Scripts => .scripts}/test.sh | 0 {Scripts => .scripts}/validate.sh | 0 Nuke.xcodeproj/project.pbxproj | 42 +++++++++++--------- 7 files changed, 41 insertions(+), 37 deletions(-) rename {Scripts => .scripts}/create-xcframeworks.sh (100%) rename {Scripts => .scripts}/install_swiftlint.sh (100%) rename {Scripts => .scripts}/lint.sh (100%) rename {Scripts => .scripts}/test.sh (100%) rename {Scripts => .scripts}/validate.sh (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 054e28e7e..f60e8d6a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: - uses: actions/checkout@v2 - name: Run Tests run: | - Scripts/test.sh -s "Nuke" -d "OS=17.4,name=iPhone 15 Pro" - Scripts/test.sh -s "NukeUI" -d "OS=17.4,name=iPhone 15 Pro" - Scripts/test.sh -s "NukeExtensions" -d "OS=17.4,name=iPhone 15 Pro" + .scripts/test.sh -s "Nuke" -d "OS=17.4,name=iPhone 15 Pro" + .scripts/test.sh -s "NukeUI" -d "OS=17.4,name=iPhone 15 Pro" + .scripts/test.sh -s "NukeExtensions" -d "OS=17.4,name=iPhone 15 Pro" macos-latest: name: Unit Tests (macOS, Xcode 15.3) runs-on: macOS-14 @@ -30,9 +30,9 @@ jobs: - uses: actions/checkout@v2 - name: Run Tests run: | - Scripts/test.sh -s "Nuke" -d "platform=macOS" - Scripts/test.sh -s "NukeUI" -d "platform=macOS" - Scripts/test.sh -s "NukeExtensions" -d "platform=macOS" + .scripts/test.sh -s "Nuke" -d "platform=macOS" + .scripts/test.sh -s "NukeUI" -d "platform=macOS" + .scripts/test.sh -s "NukeExtensions" -d "platform=macOS" tvos-latest: name: Unit Tests (tvOS 17.4, Xcode 15.3) runs-on: macOS-14 @@ -42,9 +42,9 @@ jobs: - uses: actions/checkout@v2 - name: Run Tests run: | - Scripts/test.sh -s "Nuke" -d "OS=17.4,name=Apple TV" - Scripts/test.sh -s "NukeUI" -d "OS=17.4,name=Apple TV" - Scripts/test.sh -s "NukeExtensions" -d "OS=17.4,name=Apple TV" + .scripts/test.sh -s "Nuke" -d "OS=17.4,name=Apple TV" + .scripts/test.sh -s "NukeUI" -d "OS=17.4,name=Apple TV" + .scripts/test.sh -s "NukeExtensions" -d "OS=17.4,name=Apple TV" # There is a problem with watchOS runners where they often fail to launch on CI # # watchos-latest: @@ -56,9 +56,9 @@ jobs: # - uses: actions/checkout@v2 # - name: Run Tests # run: | -# Scripts/test.sh -s "Nuke" -d "OS=9.1,name=Apple Watch Series 8 (45mm)" -# Scripts/test.sh -s "NukeUI" -d "OS=9.1,name=Apple Watch Series 8 (45mm)" -# Scripts/test.sh -s "Nuke Extensions" -d "OS=9.1,name=Apple Watch Series 8 (45mm)" +# .scripts/test.sh -s "Nuke" -d "OS=9.1,name=Apple Watch Series 8 (45mm)" +# .scripts/test.sh -s "NukeUI" -d "OS=9.1,name=Apple Watch Series 8 (45mm)" +# .scripts/test.sh -s "Nuke Extensions" -d "OS=9.1,name=Apple Watch Series 8 (45mm)" ios-xcode-14-3-1: name: Unit Tests (iOS 17.0, Xcode 15.0) runs-on: macOS-13 @@ -68,9 +68,9 @@ jobs: - uses: actions/checkout@v2 - name: Run Tests run: | - Scripts/test.sh -s "Nuke" -d "OS=17.0,name=iPhone 15 Pro" - Scripts/test.sh -s "NukeUI" -d "OS=17.0,name=iPhone 15 Pro" - Scripts/test.sh -s "NukeExtensions" -d "OS=17.0,name=iPhone 15 Pro" + .scripts/test.sh -s "Nuke" -d "OS=17.0,name=iPhone 15 Pro" + .scripts/test.sh -s "NukeUI" -d "OS=17.0,name=iPhone 15 Pro" + .scripts/test.sh -s "NukeExtensions" -d "OS=17.0,name=iPhone 15 Pro" ios-thread-safety: name: Thread Safety Tests (TSan Enabled) runs-on: macOS-14 @@ -79,7 +79,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run Tests - run: Scripts/test.sh -s "Nuke Thread Safety Tests" -d "OS=17.4,name=iPhone 15 Pro" + run: .scripts/test.sh -s "Nuke Thread Safety Tests" -d "OS=17.4,name=iPhone 15 Pro" # ios-memory-management-tests: # name: Memory Management Tests # runs-on: macOS-13 @@ -88,7 +88,7 @@ jobs: # steps: # - uses: actions/checkout@v2 # - name: Run Tests -# run: Scripts/test.sh -s "Nuke Memory Management Tests" -d "OS=14.4,name=iPhone 12 Pro" +# run: .scripts/test.sh -s "Nuke Memory Management Tests" -d "OS=14.4,name=iPhone 12 Pro" ios-performance-tests: name: Performance Tests runs-on: macOS-14 @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run Tests - run: Scripts/test.sh -s "Nuke Performance Tests" -d "OS=17.4,name=iPhone 15 Pro" + run: .scripts/test.sh -s "Nuke Performance Tests" -d "OS=17.4,name=iPhone 15 Pro" swift-build: name: Swift Build (SPM) runs-on: macOS-14 diff --git a/Scripts/create-xcframeworks.sh b/.scripts/create-xcframeworks.sh similarity index 100% rename from Scripts/create-xcframeworks.sh rename to .scripts/create-xcframeworks.sh diff --git a/Scripts/install_swiftlint.sh b/.scripts/install_swiftlint.sh similarity index 100% rename from Scripts/install_swiftlint.sh rename to .scripts/install_swiftlint.sh diff --git a/Scripts/lint.sh b/.scripts/lint.sh similarity index 100% rename from Scripts/lint.sh rename to .scripts/lint.sh diff --git a/Scripts/test.sh b/.scripts/test.sh similarity index 100% rename from Scripts/test.sh rename to .scripts/test.sh diff --git a/Scripts/validate.sh b/.scripts/validate.sh similarity index 100% rename from Scripts/validate.sh rename to .scripts/validate.sh diff --git a/Nuke.xcodeproj/project.pbxproj b/Nuke.xcodeproj/project.pbxproj index 20de75f0d..8d53148ba 100644 --- a/Nuke.xcodeproj/project.pbxproj +++ b/Nuke.xcodeproj/project.pbxproj @@ -357,9 +357,6 @@ 0C179C772282AC50008AB488 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = ""; }; 0C179C7A2283597F008AB488 /* ImageEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageEncoding.swift; sourceTree = ""; }; 0C1B987F294E28D800C09310 /* Nuke.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = Nuke.docc; sourceTree = ""; }; - 0C1E59662372EBBC00674B63 /* lint.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = lint.sh; path = Scripts/lint.sh; sourceTree = ""; }; - 0C1E59682372EBBC00674B63 /* validate.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = validate.sh; path = Scripts/validate.sh; sourceTree = ""; }; - 0C1E596A2372EBBC00674B63 /* test.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = test.sh; path = Scripts/test.sh; sourceTree = ""; }; 0C1E620A1D6F817700AD5CF5 /* ImageRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageRequestTests.swift; sourceTree = ""; }; 0C222DE2294E2DEA00012288 /* NukeUI.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = NukeUI.docc; sourceTree = ""; }; 0C222DE4294E2E0200012288 /* NukeExtensions.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = NukeExtensions.docc; sourceTree = ""; }; @@ -481,7 +478,6 @@ 0CA4ECCF26E68FC000BAC8E5 /* DataCaching.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataCaching.swift; sourceTree = ""; }; 0CA4ECD226E68FDC00BAC8E5 /* ImageCaching.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCaching.swift; sourceTree = ""; }; 0CA5D953263CCEA500E08E17 /* ImagePublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePublisher.swift; sourceTree = ""; }; - 0CA82BDC237AE09F00338375 /* install_swiftlint.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = install_swiftlint.sh; path = Scripts/install_swiftlint.sh; sourceTree = ""; }; 0CA8D8EC2958DA3700EDAA2C /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = ""; }; 0CAAB00F1E45D6DA00924450 /* NukeExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NukeExtensions.swift; sourceTree = ""; }; 0CB047992856D9AC00DF9B6D /* Cache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cache.swift; sourceTree = ""; }; @@ -646,17 +642,6 @@ path = Resources; sourceTree = ""; }; - 0C1E59652372EBA600674B63 /* Scripts */ = { - isa = PBXGroup; - children = ( - 0C1E59662372EBBC00674B63 /* lint.sh */, - 0CA82BDC237AE09F00338375 /* install_swiftlint.sh */, - 0C1E596A2372EBBC00674B63 /* test.sh */, - 0C1E59682372EBBC00674B63 /* validate.sh */, - ); - name = Scripts; - sourceTree = ""; - }; 0C38DAE228568FC30027F9FF /* NukeUI */ = { isa = PBXGroup; children = ( @@ -811,7 +796,6 @@ 0C9174911BAE99EE004A7905 /* Products */, 0CDB92761DAF9BA500002905 /* Documentation */, 0CDB927F1DAF9BA900002905 /* Metadata */, - 0C1E59652372EBA600674B63 /* Scripts */, 0C4F900222E4C4FB0070ECFD /* Frameworks */, ); sourceTree = ""; @@ -1142,6 +1126,7 @@ isa = PBXNativeTarget; buildConfigurationList = 0C55FD1228567875000FD2C9 /* Build configuration list for PBXNativeTarget "NukeExtensions" */; buildPhases = ( + 0CC04A952C4BD3BB00F1164D /* Lint */, 0C55FCF828567875000FD2C9 /* Headers */, 0C55FCF928567875000FD2C9 /* Sources */, 0C55FCFA28567875000FD2C9 /* Frameworks */, @@ -1465,7 +1450,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "Scripts/lint.sh\n"; + shellScript = ".scripts/lint.sh\n"; }; 0C38DAA228568FAE0027F9FF /* Lint */ = { isa = PBXShellScriptBuildPhase; @@ -1484,7 +1469,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "Scripts/lint.sh\n"; + shellScript = ".scripts/lint.sh\n"; }; 0C75849C29A151FF00F985F8 /* Lint */ = { isa = PBXShellScriptBuildPhase; @@ -1503,7 +1488,26 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "Scripts/lint.sh\n"; + shellScript = ".scripts/lint.sh\n"; + }; + 0CC04A952C4BD3BB00F1164D /* Lint */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = Lint; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = ".scripts/lint.sh\n"; }; /* End PBXShellScriptBuildPhase section */