Skip to content

Commit 5c6c544

Browse files
bombardier200bombardier200
authored
CI improvements, defaulting to pre build configuration for releases, added dmg background (#1612)
* Updating CI and added in new pictures assets * Updating use channel and background * finishing touches * Updating CI for copy command.
1 parent 995b9ba commit 5c6c544

18 files changed

+293
-12
lines changed

‎.github/workflows/pre-release.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Build CodeEdit
4949
env:
5050
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
51-
run: xcodebuild -scheme CodeEdit -configuration Alpha -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive
51+
run: xcodebuild -scheme CodeEdit -configuration Pre -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive
5252

5353
############################
5454
# Sign
@@ -76,14 +76,16 @@ jobs:
7676
echo "REV=$REV" >> $GITHUB_ENV
7777
security unlock-keychain -p "$RUNNER_PW"
7878
xcrun notarytool store-credentials CodeEdit --apple-id "$APPLE_ID" --team-id "$APPLE_TEAM_ID" --password "$APPLE_ID_PWD"
79+
cp "$RUNNER_TEMP/../CodeEdit/CodeEdit/Resources/dmgBackground.png" "$RUNNER_TEMP/.background.png"
7980
create-dmg \
8081
--volname "CodeEdit" \
8182
--window-pos 200 120 \
82-
--window-size 800 400 \
83-
--icon-size 100 \
84-
--icon "CodeEdit.app" 200 190 \
83+
--window-size 699 518 \
84+
--background "$RUNNER_TEMP/.background.png" \
85+
--icon-size 128 \
86+
--icon "CodeEdit.app" 170 210 \
8587
--hide-extension "CodeEdit.app" \
86-
--app-drop-link 600 185 \
88+
--app-drop-link 530 210 \
8789
--codesign "$CODESIGN_SIGN" \
8890
--notarize "CodeEdit" \
8991
--skip-jenkins \

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@
908908
85773E1D2A3E0A1F00C5D926 /* SettingsSearchResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSearchResult.swift; sourceTree = "<group>"; };
909909
85CD0C5E2A10CC3200E531FD /* URL+isImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+isImage.swift"; sourceTree = "<group>"; };
910910
85E412292A46C8CA00183F2B /* LocationsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationsSettings.swift; sourceTree = "<group>"; };
911+
8B9A0E162B9FE84B007E2DBF /* Pre.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Pre.xcconfig; sourceTree = "<group>"; };
911912
9D36E1BE2B5E7D7500443C41 /* GitBranchesGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitBranchesGroup.swift; sourceTree = "<group>"; };
912913
B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPageView.swift; sourceTree = "<group>"; };
913914
B6041F5129D7D6D6000F3454 /* SettingsWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsWindow.swift; sourceTree = "<group>"; };
@@ -1166,6 +1167,7 @@
11661167
28052DFC29730DF600F4F90A /* Alpha.xcconfig */,
11671168
28052DFD29730E0300F4F90A /* Beta.xcconfig */,
11681169
28052DFE29730E0B00F4F90A /* Release.xcconfig */,
1170+
8B9A0E162B9FE84B007E2DBF /* Pre.xcconfig */,
11691171
);
11701172
path = Configs;
11711173
sourceTree = "<group>";
@@ -4146,6 +4148,195 @@
41464148
};
41474149
name = Release;
41484150
};
4151+
8B9A0E112B9FE7D7007E2DBF /* Pre */ = {
4152+
isa = XCBuildConfiguration;
4153+
baseConfigurationReference = 28052DFC29730DF600F4F90A /* Alpha.xcconfig */;
4154+
buildSettings = {
4155+
ALWAYS_SEARCH_USER_PATHS = NO;
4156+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
4157+
CLANG_ANALYZER_NONNULL = YES;
4158+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
4159+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
4160+
CLANG_CXX_LIBRARY = "libc++";
4161+
CLANG_ENABLE_MODULES = YES;
4162+
CLANG_ENABLE_OBJC_ARC = YES;
4163+
CLANG_ENABLE_OBJC_WEAK = YES;
4164+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
4165+
CLANG_WARN_BOOL_CONVERSION = YES;
4166+
CLANG_WARN_COMMA = YES;
4167+
CLANG_WARN_CONSTANT_CONVERSION = YES;
4168+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
4169+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
4170+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
4171+
CLANG_WARN_EMPTY_BODY = YES;
4172+
CLANG_WARN_ENUM_CONVERSION = YES;
4173+
CLANG_WARN_INFINITE_RECURSION = YES;
4174+
CLANG_WARN_INT_CONVERSION = YES;
4175+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
4176+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
4177+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
4178+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
4179+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
4180+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
4181+
CLANG_WARN_STRICT_PROTOTYPES = YES;
4182+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
4183+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
4184+
CLANG_WARN_UNREACHABLE_CODE = YES;
4185+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
4186+
COPY_PHASE_STRIP = NO;
4187+
CURRENT_PROJECT_VERSION = 37;
4188+
DEAD_CODE_STRIPPING = YES;
4189+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
4190+
ENABLE_NS_ASSERTIONS = NO;
4191+
ENABLE_STRICT_OBJC_MSGSEND = YES;
4192+
GCC_C_LANGUAGE_STANDARD = gnu11;
4193+
GCC_NO_COMMON_BLOCKS = YES;
4194+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
4195+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
4196+
GCC_WARN_UNDECLARED_SELECTOR = YES;
4197+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
4198+
GCC_WARN_UNUSED_FUNCTION = YES;
4199+
GCC_WARN_UNUSED_VARIABLE = YES;
4200+
MACOSX_DEPLOYMENT_TARGET = 13.0;
4201+
MARKETING_VERSION = "";
4202+
MTL_ENABLE_DEBUG_INFO = NO;
4203+
MTL_FAST_MATH = YES;
4204+
OTHER_SWIFT_FLAGS = "-D ALPHA";
4205+
RUN_DOCUMENTATION_COMPILER = YES;
4206+
SDKROOT = macosx;
4207+
SWIFT_COMPILATION_MODE = wholemodule;
4208+
SWIFT_OPTIMIZATION_LEVEL = "-O";
4209+
SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_SDK_DIR)/MacOSX.sdk/System/Library/PrivateFrameworks";
4210+
VERSIONING_SYSTEM = "apple-generic";
4211+
};
4212+
name = Pre;
4213+
};
4214+
8B9A0E122B9FE7D7007E2DBF /* Pre */ = {
4215+
isa = XCBuildConfiguration;
4216+
baseConfigurationReference = 28052DFC29730DF600F4F90A /* Alpha.xcconfig */;
4217+
buildSettings = {
4218+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
4219+
ASSETCATALOG_COMPILER_APPICON_NAME = "${CE_APPICON_NAME}";
4220+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
4221+
CODE_SIGN_ENTITLEMENTS = CodeEdit/CodeEdit.entitlements;
4222+
CODE_SIGN_IDENTITY = "Apple Development";
4223+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
4224+
CODE_SIGN_STYLE = Automatic;
4225+
COMBINE_HIDPI_IMAGES = YES;
4226+
DEAD_CODE_STRIPPING = YES;
4227+
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
4228+
DEVELOPMENT_TEAM = "";
4229+
ENABLE_HARDENED_RUNTIME = YES;
4230+
ENABLE_PREVIEWS = YES;
4231+
GENERATE_INFOPLIST_FILE = NO;
4232+
INFOPLIST_FILE = CodeEdit/Info.plist;
4233+
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022-2024 CodeEdit";
4234+
INFOPLIST_KEY_NSPrincipalClass = CodeEdit.CodeEditApplication;
4235+
LD_RUNPATH_SEARCH_PATHS = (
4236+
"$(inherited)",
4237+
"@executable_path/../Frameworks",
4238+
);
4239+
MACOSX_DEPLOYMENT_TARGET = 13.0;
4240+
MARKETING_VERSION = "Change in Info.plist";
4241+
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
4242+
PRODUCT_NAME = "$(TARGET_NAME)";
4243+
PROVISIONING_PROFILE_SPECIFIER = "";
4244+
RUN_DOCUMENTATION_COMPILER = NO;
4245+
SWIFT_EMIT_LOC_STRINGS = YES;
4246+
SWIFT_OBJC_BRIDGING_HEADER = "";
4247+
SWIFT_VERSION = 5.0;
4248+
SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited)";
4249+
};
4250+
name = Pre;
4251+
};
4252+
8B9A0E132B9FE7D7007E2DBF /* Pre */ = {
4253+
isa = XCBuildConfiguration;
4254+
baseConfigurationReference = 28052DFC29730DF600F4F90A /* Alpha.xcconfig */;
4255+
buildSettings = {
4256+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
4257+
BUNDLE_LOADER = "$(TEST_HOST)";
4258+
CODE_SIGN_STYLE = Automatic;
4259+
COMBINE_HIDPI_IMAGES = YES;
4260+
CURRENT_PROJECT_VERSION = 37;
4261+
DEAD_CODE_STRIPPING = YES;
4262+
DEVELOPMENT_TEAM = "";
4263+
GENERATE_INFOPLIST_FILE = YES;
4264+
LD_RUNPATH_SEARCH_PATHS = (
4265+
"$(inherited)",
4266+
"@executable_path/../Frameworks",
4267+
"@loader_path/../Frameworks",
4268+
);
4269+
MACOSX_DEPLOYMENT_TARGET = 13.0;
4270+
MARKETING_VERSION = 1.0;
4271+
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditTests;
4272+
PRODUCT_NAME = "$(TARGET_NAME)";
4273+
SWIFT_EMIT_LOC_STRINGS = NO;
4274+
SWIFT_VERSION = 5.0;
4275+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CodeEdit.app/Contents/MacOS/CodeEdit";
4276+
};
4277+
name = Pre;
4278+
};
4279+
8B9A0E142B9FE7D7007E2DBF /* Pre */ = {
4280+
isa = XCBuildConfiguration;
4281+
baseConfigurationReference = 28052DFC29730DF600F4F90A /* Alpha.xcconfig */;
4282+
buildSettings = {
4283+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
4284+
CLANG_ENABLE_MODULES = YES;
4285+
CODE_SIGN_STYLE = Automatic;
4286+
COMBINE_HIDPI_IMAGES = YES;
4287+
CURRENT_PROJECT_VERSION = 37;
4288+
DEAD_CODE_STRIPPING = YES;
4289+
DEVELOPMENT_TEAM = "";
4290+
GENERATE_INFOPLIST_FILE = YES;
4291+
LD_RUNPATH_SEARCH_PATHS = (
4292+
"$(inherited)",
4293+
"@executable_path/../Frameworks",
4294+
"@loader_path/../Frameworks",
4295+
);
4296+
MARKETING_VERSION = 1.0;
4297+
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditUITests;
4298+
PRODUCT_NAME = "$(TARGET_NAME)";
4299+
PROVISIONING_PROFILE = "";
4300+
SWIFT_EMIT_LOC_STRINGS = NO;
4301+
SWIFT_OBJC_BRIDGING_HEADER = "CodeEditUITests/Features/CodeEditUI/CodeEditUITests-Bridging-Header.h";
4302+
SWIFT_VERSION = 5.0;
4303+
TEST_TARGET_NAME = CodeEdit;
4304+
};
4305+
name = Pre;
4306+
};
4307+
8B9A0E152B9FE7D7007E2DBF /* Pre */ = {
4308+
isa = XCBuildConfiguration;
4309+
baseConfigurationReference = 28052DFC29730DF600F4F90A /* Alpha.xcconfig */;
4310+
buildSettings = {
4311+
CODE_SIGN_ENTITLEMENTS = OpenWithCodeEdit/OpenWithCodeEdit.entitlements;
4312+
CODE_SIGN_IDENTITY = "-";
4313+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
4314+
CODE_SIGN_STYLE = Automatic;
4315+
COMBINE_HIDPI_IMAGES = YES;
4316+
CURRENT_PROJECT_VERSION = 37;
4317+
DEAD_CODE_STRIPPING = YES;
4318+
DEVELOPMENT_TEAM = "";
4319+
ENABLE_HARDENED_RUNTIME = YES;
4320+
GENERATE_INFOPLIST_FILE = NO;
4321+
INFOPLIST_FILE = OpenWithCodeEdit/Info.plist;
4322+
INFOPLIST_KEY_CFBundleDisplayName = OpenWithCodeEdit;
4323+
INFOPLIST_KEY_LSUIElement = YES;
4324+
INFOPLIST_KEY_NSHumanReadableCopyright = "";
4325+
LD_RUNPATH_SEARCH_PATHS = (
4326+
"$(inherited)",
4327+
"@executable_path/../Frameworks",
4328+
"@executable_path/../../../../Frameworks",
4329+
);
4330+
MACOSX_DEPLOYMENT_TARGET = 13.0;
4331+
MARKETING_VERSION = 1.0;
4332+
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
4333+
PRODUCT_NAME = "$(TARGET_NAME)";
4334+
SKIP_INSTALL = YES;
4335+
SWIFT_EMIT_LOC_STRINGS = YES;
4336+
SWIFT_VERSION = 5.0;
4337+
};
4338+
name = Pre;
4339+
};
41494340
B658FB4F27DA9E1000EA4DBD /* Debug */ = {
41504341
isa = XCBuildConfiguration;
41514342
baseConfigurationReference = 28052DFB29730DE300F4F90A /* Debug.xcconfig */;
@@ -4472,6 +4663,7 @@
44724663
2BE487F628245162003F3F64 /* Debug */,
44734664
2BE487F728245162003F3F64 /* Release */,
44744665
28052DEE2973045200F4F90A /* Alpha */,
4666+
8B9A0E152B9FE7D7007E2DBF /* Pre */,
44754667
28052DF32973045C00F4F90A /* Beta */,
44764668
);
44774669
defaultConfigurationIsVisible = 0;
@@ -4483,6 +4675,7 @@
44834675
B658FB4F27DA9E1000EA4DBD /* Debug */,
44844676
B658FB5027DA9E1000EA4DBD /* Release */,
44854677
28052DEA2973045200F4F90A /* Alpha */,
4678+
8B9A0E112B9FE7D7007E2DBF /* Pre */,
44864679
28052DEF2973045C00F4F90A /* Beta */,
44874680
);
44884681
defaultConfigurationIsVisible = 0;
@@ -4494,6 +4687,7 @@
44944687
B658FB5227DA9E1000EA4DBD /* Debug */,
44954688
B658FB5327DA9E1000EA4DBD /* Release */,
44964689
28052DEB2973045200F4F90A /* Alpha */,
4690+
8B9A0E122B9FE7D7007E2DBF /* Pre */,
44974691
28052DF02973045C00F4F90A /* Beta */,
44984692
);
44994693
defaultConfigurationIsVisible = 0;
@@ -4505,6 +4699,7 @@
45054699
B658FB5527DA9E1000EA4DBD /* Debug */,
45064700
B658FB5627DA9E1000EA4DBD /* Release */,
45074701
28052DEC2973045200F4F90A /* Alpha */,
4702+
8B9A0E132B9FE7D7007E2DBF /* Pre */,
45084703
28052DF12973045C00F4F90A /* Beta */,
45094704
);
45104705
defaultConfigurationIsVisible = 0;
@@ -4516,6 +4711,7 @@
45164711
B658FB5827DA9E1000EA4DBD /* Debug */,
45174712
B658FB5927DA9E1000EA4DBD /* Release */,
45184713
28052DED2973045200F4F90A /* Alpha */,
4714+
8B9A0E142B9FE7D7007E2DBF /* Pre */,
45194715
28052DF22973045C00F4F90A /* Beta */,
45204716
);
45214717
defaultConfigurationIsVisible = 0;

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/CodeEdit-Icon-Pre-128.png

21.8 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/[email protected]

65 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/CodeEdit-Icon-Pre-16.png

1.84 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/[email protected]

3.26 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/CodeEdit-Icon-Pre-256.png

65 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/[email protected]

225 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/CodeEdit-Icon-Pre-32.png

3.26 KB
Loading

‎CodeEdit/Assets.xcassets/AppIconPre.appiconset/[email protected]

7.82 KB
Loading

0 commit comments

Comments
 (0)