Skip to content

UPDATE CI #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ name: Swift

on:
pull_request:
branches: [ main ]

pull_request:
branches: [ develop ]
branches: [ main, develop ]

jobs:

Expand All @@ -20,7 +17,9 @@ jobs:

build:
needs: swiftLint
runs-on: macos-latest
env:
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
runs-on: macos-11.0
steps:
- uses: actions/checkout@v2
- name: Install Bundle
Expand All @@ -31,20 +30,22 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: build
path: derivedData/Build/Products/Debug-iphonesimulator/Addame.app
path: '"derivedData/Build/Products/Debug CI-iphonesimulator/Addame.app"'

unitTests:
needs: build
runs-on: macos-latest
env:
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
runs-on: macos-11.0
steps:
- uses: actions/checkout@v2
- name: Download core tests
uses: actions/download-artifact@v2
with:
name: coreTests
path: derivedData/Build/Products/Debug-iphonesimulator/EventFormViewTests.xctest
- name: Install Bundle
run: bundle install
- name: Run unit tests
run: bundle exec fastlane unitTestLane
- name: Run tests
uses: actions/download-artifact@v2
with:
name: unitTests
path: '"derivedData/Build/Products/Debug CI-iphonesimulator/EventFormViewTests.xctest"'

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,7 @@ Addame/Configs/Production.xcconfig
/fastlane/FastlaneRunner
test_output/report.html
test_output/report.junit
env-vars.sh
Addame/Autogenerated/AppSecrets.generated.swift
Addame/Templates/AppSecrets.stencil
AddameSPM/Sources/ProfileView/File.swift
153 changes: 134 additions & 19 deletions Addame.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
objects = {

/* Begin PBXBuildFile section */
C3186C642647F1FB00E1B69F /* AppFeature in Frameworks */ = {isa = PBXBuildFile; productRef = C3186C632647F1FB00E1B69F /* AppFeature */; };
C33DFAC8261F1B4100132010 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33DFAC7261F1B4100132010 /* Environment.swift */; };
C3511D5D26EF6044004B9155 /* AppFeature in Frameworks */ = {isa = PBXBuildFile; productRef = C3511D5C26EF6044004B9155 /* AppFeature */; };
C3E50CA0261B5DFA00285977 /* Addame.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E50C9F261B5DFA00285977 /* Addame.swift */; };
C3E50CA4261B5DFF00285977 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3E50CA3261B5DFF00285977 /* Assets.xcassets */; };
C3E50CA7261B5DFF00285977 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3E50CA6261B5DFF00285977 /* Preview Assets.xcassets */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
C33DFABA261F1A9700132010 /* ProductionCopy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ProductionCopy.xcconfig; sourceTree = "<group>"; };
C33DFABA261F1A9700132010 /* ProductionCI.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ProductionCI.xcconfig; sourceTree = "<group>"; };
C33DFABB261F1A9700132010 /* Production.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Production.xcconfig; sourceTree = "<group>"; };
C33DFABC261F1A9700132010 /* DevelopmentCopy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DevelopmentCopy.xcconfig; sourceTree = "<group>"; };
C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DevelopmentCI.xcconfig; sourceTree = "<group>"; };
C33DFABD261F1A9700132010 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = "<group>"; };
C33DFAC7261F1B4100132010 /* Environment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
C3E50C9C261B5DFA00285977 /* Addame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Addame.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -32,7 +32,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C3186C642647F1FB00E1B69F /* AppFeature in Frameworks */,
C3511D5D26EF6044004B9155 /* AppFeature in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -44,9 +44,9 @@
children = (
C33DFAC7261F1B4100132010 /* Environment.swift */,
C33DFABD261F1A9700132010 /* Development.xcconfig */,
C33DFABC261F1A9700132010 /* DevelopmentCopy.xcconfig */,
C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */,
C33DFABB261F1A9700132010 /* Production.xcconfig */,
C33DFABA261F1A9700132010 /* ProductionCopy.xcconfig */,
C33DFABA261F1A9700132010 /* ProductionCI.xcconfig */,
);
path = Configs;
sourceTree = "<group>";
Expand Down Expand Up @@ -107,14 +107,15 @@
C3E50C9A261B5DFA00285977 /* Resources */,
C36C678E26E3FC9A007CC94D /* swift-format */,
C36AE8D826E8ABD6002FFF84 /* SwiftLint */,
C39CB4FF26EF597C004BC15F /* ShellScript */,
);
buildRules = (
);
dependencies = (
);
name = Addame;
packageProductDependencies = (
C3186C632647F1FB00E1B69F /* AppFeature */,
C3511D5C26EF6044004B9155 /* AppFeature */,
);
productName = TComposableAAddaMe;
productReference = C3E50C9C261B5DFA00285977 /* Addame.app */;
Expand Down Expand Up @@ -201,6 +202,23 @@
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#if which swift-format >/dev/null; then\n # swift-format -m format -i -r ${PROJECT_DIR}\n # swift-format -m lint -r ${PROJECT_DIR}\n#else\n # echo \"warning: swift-format not installed\"\n#fi\n";
};
C39CB4FF26EF597C004BC15F /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -216,9 +234,100 @@
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
C3E50CA9261B5DFF00285977 /* Debug */ = {
C3C1EE1C26EDFC7E00376AE6 /* Debug Development */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C33DFABD261F1A9700132010 /* Development.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = "Debug Development";
};
C3C1EE1D26EDFC7E00376AE6 /* Debug Development */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C33DFABD261F1A9700132010 /* Development.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_ASSET_PATHS = "\"Addame/Preview Content\"";
DEVELOPMENT_TEAM = 6989658CU5;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = AddaMe/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.addame.AddaMeIOS;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug Development";
};
C3E50CA9261B5DFF00285977 /* Debug CI */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -277,7 +386,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
name = "Debug CI";
};
C3E50CAA261B5DFF00285977 /* Release */ = {
isa = XCBuildConfiguration;
Expand Down Expand Up @@ -336,14 +445,15 @@
};
name = Release;
};
C3E50CAC261B5DFF00285977 /* Debug */ = {
C3E50CAC261B5DFF00285977 /* Debug CI */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C33DFABD261F1A9700132010 /* Development.xcconfig */;
baseConfigurationReference = C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_ASSET_PATHS = "\"Addame/Preview Content\"";
DEVELOPMENT_TEAM = 6989658CU5;
ENABLE_PREVIEWS = YES;
Expand All @@ -353,23 +463,25 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
MARKETING_VERSION = 1.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.addame.AddaMeIOS;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
name = "Debug CI";
};
C3E50CAD261B5DFF00285977 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C33DFABB261F1A9700132010 /* Production.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_ASSET_PATHS = "\"Addame/Preview Content\"";
DEVELOPMENT_TEAM = 6989658CU5;
ENABLE_PREVIEWS = YES;
Expand All @@ -379,9 +491,10 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
MARKETING_VERSION = 1.2.5;
PRODUCT_BUNDLE_IDENTIFIER = com.addame.AddaMeIOS;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -394,7 +507,8 @@
C3E50C97261B5DFA00285977 /* Build configuration list for PBXProject "Addame" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C3E50CA9261B5DFF00285977 /* Debug */,
C3E50CA9261B5DFF00285977 /* Debug CI */,
C3C1EE1C26EDFC7E00376AE6 /* Debug Development */,
C3E50CAA261B5DFF00285977 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -403,7 +517,8 @@
C3E50CAB261B5DFF00285977 /* Build configuration list for PBXNativeTarget "Addame" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C3E50CAC261B5DFF00285977 /* Debug */,
C3E50CAC261B5DFF00285977 /* Debug CI */,
C3C1EE1D26EDFC7E00376AE6 /* Debug Development */,
C3E50CAD261B5DFF00285977 /* Release */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -412,7 +527,7 @@
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
C3186C632647F1FB00E1B69F /* AppFeature */ = {
C3511D5C26EF6044004B9155 /* AppFeature */ = {
isa = XCSwiftPackageProductDependency;
productName = AppFeature;
};
Expand Down
2 changes: 1 addition & 1 deletion Addame.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading