Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2868def
remove automatci
raluaces Mar 7, 2025
597608c
pass username
raluaces Mar 7, 2025
8d99f96
auth for action
raluaces Mar 7, 2025
e719372
fix fast file
raluaces Mar 7, 2025
46e06ee
version bump
raluaces Mar 7, 2025
6baa9e8
Fix build number and specify encryption regulation in info.plist
miluaces Mar 7, 2025
e3dc9f5
fixes
raluaces Mar 7, 2025
de12e8f
better auto increment build
raluaces Mar 7, 2025
6721ce9
move
raluaces Mar 7, 2025
acedd90
test
raluaces Mar 7, 2025
3ecddb8
another test
raluaces Mar 7, 2025
ff37814
add identifier
raluaces Mar 7, 2025
c48da2b
comma
raluaces Mar 7, 2025
74a2baf
wrong place
raluaces Mar 7, 2025
4b01c59
try
raluaces Mar 7, 2025
d96179f
another test
raluaces Mar 7, 2025
2962598
ok again
raluaces Mar 7, 2025
20f80d6
asdf
raluaces Mar 7, 2025
8010237
prj dir test
raluaces Mar 7, 2025
ca1d9f9
what about this
raluaces Mar 7, 2025
6d65f81
what about this
raluaces Mar 7, 2025
bc88dbd
remove redundant step
raluaces Mar 7, 2025
c7ea066
try to get CI going
raluaces Mar 8, 2025
a419a4b
typo
raluaces Mar 8, 2025
91ea658
fix workspace location
raluaces Mar 8, 2025
f7d537e
set scheme
raluaces Mar 8, 2025
b058fe8
scheme name
raluaces Mar 8, 2025
b20316d
adjust device list
raluaces Mar 8, 2025
600a2fa
try scan instead
raluaces Mar 8, 2025
177e22a
name fixes
raluaces Mar 8, 2025
10da580
add fastlane package
raluaces Mar 8, 2025
566c8cd
test
raluaces Mar 8, 2025
f93b18b
Add snapfile
miluaces Mar 8, 2025
6eeea61
Add snapfile
miluaces Mar 8, 2025
5cb7b14
remove snapfile
raluaces Mar 8, 2025
24f9eff
adjust ci
Mar 9, 2025
42510a4
stupid vscode
raluaces Mar 9, 2025
27e500f
Merge branch 'fastlane' into ci
raluaces Mar 9, 2025
6cfbc33
Merge pull request #8 from django-files/ci
raluaces Mar 9, 2025
cedacd5
concurency fix
raluaces Mar 9, 2025
9de5d09
Add snapfile
miluaces Mar 8, 2025
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
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: "Django Files iOS CI"
on:
push:
branches:
- '**'
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
build:
name: "CI"
runs-on: macos-15
steps:
- name: "Add Match Repo SSH Key"
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.SSH_KEY }}
- uses: actions/checkout@v4
- name: "Fastlane Tests"
run: fastlane tests
env:
CI: true
# - name: "Fastlane CI"
# run: fastlane ci
# env:
# MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
# MATCH_URL: git@github.com:django-files/ios-match-certs.git
# CI: true
# APPLE_ID: ${{ secrets.APPLE_ID }}
# ASC_ISSUER_ID: ${{ secrets.ASC_ISSUER_ID }}
# ASC_API_KEY: ${{ secrets.ASC_API_KEY }}
# ASC_API_ID: ${{ secrets.ASC_API_ID }}
# BUILD_NUMBER: ${{ github.run_number }}
10 changes: 7 additions & 3 deletions .github/workflows/ios-testflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: build-ios-app
on:
push:
branches:
- 'master'
- 'fastlane'
- 'main'
jobs:
build:
runs-on: macos-15
Expand All @@ -21,4 +20,9 @@ jobs:
env:
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
MATCH_URL: git@github.com:django-files/ios-match-certs.git
CI: false
CI: false
APPLE_ID: ${{ secrets.APPLE_ID }}
ASC_ISSUER_ID: ${{ secrets.ASC_ISSUER_ID }}
ASC_API_KEY: ${{ secrets.ASC_API_KEY }}
ASC_API_ID: ${{ secrets.ASC_API_ID }}
BUILD_NUMBER: ${{ github.run_number }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ xcuserdata/
*.dSYM

.build/
Django Files.xcodeproj/project.xcworkspace/xcuserdata/
fastlane/
29 changes: 25 additions & 4 deletions Django Files.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
4C82CB892D624E8700C0893B /* UploadAndCopy.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 4C82CB7F2D624E8700C0893B /* UploadAndCopy.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
4CA2E48A2D6D49D6006EF3F0 /* HTTPTypes in Frameworks */ = {isa = PBXBuildFile; productRef = 4CA2E4892D6D49D6006EF3F0 /* HTTPTypes */; };
4CA2E48C2D6D49D6006EF3F0 /* HTTPTypesFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 4CA2E48B2D6D49D6006EF3F0 /* HTTPTypesFoundation */; };
4CE57E8B2D7C9F440073CFC1 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE57E8A2D7C9F440073CFC1 /* SnapshotHelper.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -57,6 +58,7 @@
4C5E21002D603C3B009EE83A /* Django FilesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Django FilesTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
4C5E210A2D603C3B009EE83A /* Django FilesUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Django FilesUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
4C82CB7F2D624E8700C0893B /* UploadAndCopy.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = UploadAndCopy.appex; sourceTree = BUILT_PRODUCTS_DIR; };
4CE57E8A2D7C9F440073CFC1 /* SnapshotHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
Expand Down Expand Up @@ -157,6 +159,7 @@
4C5E20E32D603C3B009EE83A = {
isa = PBXGroup;
children = (
4CE57E8A2D7C9F440073CFC1 /* SnapshotHelper.swift */,
4C5E20EE2D603C3B009EE83A /* Django Files */,
4C5E21032D603C3B009EE83A /* Django FilesTests */,
4C5E210D2D603C3B009EE83A /* Django FilesUITests */,
Expand Down Expand Up @@ -320,6 +323,7 @@
minimizedProjectReferenceProxies = 1;
packageReferences = (
4C82CB4F2D62372200C0893B /* XCRemoteSwiftPackageReference "swift-http-types" */,
4CE57E892D7C9EB70073CFC1 /* XCRemoteSwiftPackageReference "fastlane" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = 4C5E20ED2D603C3B009EE83A /* Products */;
Expand Down Expand Up @@ -384,6 +388,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4CE57E8B2D7C9F440073CFC1 /* SnapshotHelper.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -424,7 +429,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_ASSET_PATHS = "\"Django Files/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZY6BPTGK47;
Expand Down Expand Up @@ -467,7 +472,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_ASSET_PATHS = "\"Django Files/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZY6BPTGK47;
Expand Down Expand Up @@ -668,6 +673,10 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = blastsoftstudios.djangofilesUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -685,6 +694,10 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = blastsoftstudios.djangofilesUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -699,7 +712,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZY6BPTGK47;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -734,7 +747,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZY6BPTGK47;
GENERATE_INFOPLIST_FILE = YES;
Expand Down Expand Up @@ -821,6 +834,14 @@
minimumVersion = 1.3.1;
};
};
4CE57E892D7C9EB70073CFC1 /* XCRemoteSwiftPackageReference "fastlane" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/fastlane/fastlane";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.226.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down

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

This file was deleted.

Binary file not shown.
2 changes: 2 additions & 0 deletions Django Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>CFBundleIdentifier</key>
<string>com.djangofiles.app</string>
<key>CFBundleURLTypes</key>
Expand Down
44 changes: 0 additions & 44 deletions Django FilesUITests/Snapfile.swift

This file was deleted.

Loading